diff options
author | erihel <erihel@gmail.com> | 2013-07-16 16:00:06 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2013-07-16 16:00:06 +0200 |
commit | b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d (patch) | |
tree | 478a4e920e62c4bffe9785203ac7dbfc5055e6c9 /src/app | |
parent | 3e8568bda49b55c7e5c0cd40f3988cf1f1e9f62d (diff) | |
download | colobot-b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d.tar.gz colobot-b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d.tar.bz2 colobot-b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d.zip |
Datadir in command line didn't work with config.
Values from config file overwrote datadir
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/app.cpp | 8 | ||||
-rw-r--r-- | src/app/app.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index f98e0fc..f6fe19e 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -110,6 +110,7 @@ CApplication::CApplication() m_exitCode = 0; m_active = false; m_debugModes = 0; + m_customDataPath = false; m_windowTitle = "COLOBOT"; @@ -344,6 +345,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) case OPT_DATADIR: { m_dataPath = optarg; + m_customDataPath = true; GetLogger()->Info("Using custom data dir: '%s'\n", m_dataPath.c_str()); break; } @@ -404,7 +406,7 @@ bool CApplication::Create() } else { - if (GetProfile().GetLocalProfileString("Resources", "Data", path)) + if (!m_customDataPath && GetProfile().GetLocalProfileString("Resources", "Data", path)) m_dataPath = path; } @@ -440,7 +442,7 @@ bool CApplication::Create() GetProfile().SetLocalProfileString("Resources", "Music", GetDataSubdirPath(DIR_MUSIC)); } - if (GetProfile().GetLocalProfileString("Resources", "Sound", path)) + if (!m_customDataPath && GetProfile().GetLocalProfileString("Resources", "Sound", path)) { m_sound->CacheAll(path); } @@ -449,7 +451,7 @@ bool CApplication::Create() m_sound->CacheAll(GetDataSubdirPath(DIR_SOUND)); } - if (GetProfile().GetLocalProfileString("Resources", "Music", path)) + if (!m_customDataPath && GetProfile().GetLocalProfileString("Resources", "Music", path)) { m_sound->AddMusicFiles(path); } diff --git a/src/app/app.h b/src/app/app.h index 269fa9b..6b02f67 100644 --- a/src/app/app.h +++ b/src/app/app.h @@ -480,6 +480,9 @@ protected: //! 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; |