diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
commit | 89a3f586a224328b430ba2483ce5c12b33709c6a (patch) | |
tree | 691e1da1e297f7ea9045be5454747ca454680cb2 /src/app/app.h | |
parent | c9335534d6bc7a59dbabf6976d41fd1e5edc8ab3 (diff) | |
parent | 1d42c71645548ae86b438c84898a07b539f262ac (diff) | |
download | colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.gz colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.bz2 colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.zip |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/app/app.h')
-rw-r--r-- | src/app/app.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/app/app.h b/src/app/app.h index d8f6206..4aa97ce 100644 --- a/src/app/app.h +++ b/src/app/app.h @@ -25,13 +25,12 @@ #include "common/global.h" #include "common/singleton.h" +#include "common/profile.h" #include "graphics/core/device.h" #include "graphics/engine/engine.h" #include "graphics/opengl/gldevice.h" -#include "plugins/pluginmanager.h" - #include <string> #include <vector> @@ -312,15 +311,16 @@ public: //! Returns the full path to data directory std::string GetDataDirPath(); - //! Returns the full path to a file in data directory given standard dir and subpath - std::string GetDataFilePath(DataDir dir, const std::string &subpath); + //! Returns the full path to a standard dir in data directory + std::string GetDataSubdirPath(DataDir stdDir); - //! Returns the full path to a file in data directory given custom subpath in data dir - std::string GetDataFilePath(const std::string &subpath); + //! Returns the full path to a file in data directory given standard dir and subpath + std::string GetDataFilePath(DataDir stdDir, const std::string &subpath); //! Management of language //@{ Language GetLanguage(); + char GetLanguageChar(); void SetLanguage(Language language); //@} @@ -379,8 +379,6 @@ protected: CSoundInterface* m_sound; //! Main class of the proper game engine CRobotMain* m_robotMain; - //! Plugin manager - CPluginManager* m_pluginManager; //! Profile (INI) reader/writer CProfile* m_profile; |