summaryrefslogtreecommitdiffstats
path: root/src/app/app.cpp
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-26 22:57:43 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-26 22:57:43 +0200
commitf6638a173e21fbee3cc961d3dea82cc89382b873 (patch)
tree115936bf2657563b347f3d0e20735d9f4b5da689 /src/app/app.cpp
parent6cce7ec6fd262178ce91d218f9287363842349cd (diff)
downloadcolobot-f6638a173e21fbee3cc961d3dea82cc89382b873.tar.gz
colobot-f6638a173e21fbee3cc961d3dea82cc89382b873.tar.bz2
colobot-f6638a173e21fbee3cc961d3dea82cc89382b873.zip
Work in progress on opening files, and listing dirs
Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
Diffstat (limited to 'src/app/app.cpp')
-rw-r--r--src/app/app.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 00977d1..8c2dd43 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();