Merge branch 'dev-physfs' into dev

Conflicts:
	src/app/app.cpp

1 files changed, 8 insertions, 8 deletions

diff --git a/src/app/app.h b/src/app/app.h
index 21ece4c..c73cb53 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -44,7 +44,6 @@ class CInstanceManager;
 class CEventQueue;
 class CRobotMain;
 class CSoundInterface;
-class CGameData;
 
 namespace Gfx {
 class CModelManager;
@@ -357,6 +356,9 @@ public:
 protected:
     //! Creates the window's SDL_Surface
     bool CreateVideoSurface();
+    
+    //! Loads all mods from given directory
+    void LoadModsFromDir(const std::string &dir);
 
     //! Processes the captured SDL event to Event struct
     Event       ProcessSystemEvent();
@@ -404,8 +406,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;
@@ -469,16 +469,16 @@ 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;
     
+    //! Path to directory with save files
+    std::string     m_savePath;
+   
     //@{
     //! Scene to run on startup
     std::string     m_runSceneName;