summaryrefslogtreecommitdiffstats
path: root/src/app/app.h
diff options
context:
space:
mode:
authorKrzysztof Dermont <erihel@gmail.com>2014-06-20 23:41:38 +0200
committerKrzysztof Dermont <erihel@gmail.com>2014-06-20 23:51:28 +0200
commit2260f6bf4feb62929e32a1bea9cd3f403aa034b1 (patch)
treea9f830fe8ddfa57598a0802ced6540befb8c8c75 /src/app/app.h
parentba62e6f8be5f7008939677ce70799ecc26adf420 (diff)
downloadcolobot-2260f6bf4feb62929e32a1bea9cd3f403aa034b1.tar.gz
colobot-2260f6bf4feb62929e32a1bea9cd3f403aa034b1.tar.bz2
colobot-2260f6bf4feb62929e32a1bea9cd3f403aa034b1.zip
Big part of PhysFS support
* removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support
Diffstat (limited to 'src/app/app.h')
-rw-r--r--src/app/app.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/app/app.h b/src/app/app.h
index 86a757f..66b8900 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -42,7 +42,6 @@ class CInstanceManager;
class CEventQueue;
class CRobotMain;
class CSoundInterface;
-class CGameData;
namespace Gfx {
class CModelManager;
@@ -402,8 +401,6 @@ protected:
CRobotMain* m_robotMain;
//! Profile (INI) reader/writer
CProfile* m_profile;
- //! Game data
- CGameData* m_gameData;
//! Code to return at exit
int m_exitCode;
@@ -467,16 +464,7 @@ protected:
std::vector<int> m_joyAxeState;
//! Current state of joystick buttons; may be updated from another thread
std::vector<bool> m_joyButtonState;
-
- //! Path to directory with data files
- std::string m_dataPath;
-
- //! True if datadir was passed in command line
- bool m_customDataPath;
-
- //! Path to directory with language files
- std::string m_langPath;
-
+
//@{
//! Scene to run on startup
std::string m_runSceneName;