From 2260f6bf4feb62929e32a1bea9cd3f403aa034b1 Mon Sep 17 00:00:00 2001
From: Krzysztof Dermont <erihel@gmail.com>
Date: Fri, 20 Jun 2014 23:41:38 +0200
Subject: 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
---
 src/app/app.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/app/app.h')

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;
-- 
cgit v1.2.3-1-g7c22


From 0b2f25a6e3fda014b0f5a4282283fb90b0958d42 Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 6 Aug 2014 12:27:17 +0200
Subject: Restored -datadir and -langdir arguments, added -savedir

Also, fixed some crashes when unable to open file
---
 src/app/app.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/app/app.h')

diff --git a/src/app/app.h b/src/app/app.h
index 66b8900..0df3096 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -464,6 +464,15 @@ 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;
+    
+    //! 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
-- 
cgit v1.2.3-1-g7c22


From f0b38721e05dbda1d3562abc06fec535d1aa5a07 Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 6 Aug 2014 12:59:27 +0200
Subject: Loading all mods found in "mods" directory

---
 src/app/app.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/app/app.h')

diff --git a/src/app/app.h b/src/app/app.h
index 0df3096..2049fb2 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -354,6 +354,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();
-- 
cgit v1.2.3-1-g7c22