diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
commit | e9660c47c69327a131c4e4b15bea4bdc7937fd61 (patch) | |
tree | c7edc252258b6149ad09fcf9ba609f1d8cb92ae0 /src/app/app.cpp | |
parent | 677ce3960cd13cbf994311c76d75b343b22fd480 (diff) | |
parent | df4e3dfb6e623889757afe79fc4dfd29ae85748e (diff) | |
download | colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.gz colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.bz2 colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.zip |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/app/app.cpp')
-rw-r--r-- | src/app/app.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 0b9aae6..d6fc2dd 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -132,7 +132,7 @@ CApplication::CApplication() m_dataPath = "./data"; - m_language = LANG_ENGLISH; + m_language = LANGUAGE_ENGLISH; m_lowCPU = true; @@ -215,13 +215,13 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) { waitLanguage = false; if (arg == "en") - m_language = LANG_ENGLISH; + m_language = LANGUAGE_ENGLISH; else if (arg == "de") - m_language = LANG_GERMAN; + m_language = LANGUAGE_GERMAN; else if (arg == "fr") - m_language = LANG_FRENCH; + m_language = LANGUAGE_FRENCH; else if (arg == "pl") - m_language = LANG_POLISH; + m_language = LANGUAGE_POLISH; else return PARSE_ARGS_FAIL; continue; @@ -293,19 +293,19 @@ bool CApplication::Create() std::string locale = "C"; switch (m_language) { - case LANG_ENGLISH: + case LANGUAGE_ENGLISH: locale = "en_US.utf8"; break; - case LANG_GERMAN: + case LANGUAGE_GERMAN: locale = "de_DE.utf8"; break; - case LANG_FRENCH: + case LANGUAGE_FRENCH: locale = "fr_FR.utf8"; break; - case LANG_POLISH: + case LANGUAGE_POLISH: locale = "pl_PL.utf8"; break; } @@ -326,7 +326,7 @@ bool CApplication::Create() // Temporarily -- only in windowed mode m_deviceConfig.fullScreen = false; - // Create the sound instance. + //Create the sound instance. if (!GetProfile()->InitCurrentDirectory()) { GetLogger()->Warn("Config not found. Default values will be used!\n"); m_sound = new CSoundInterface(); |