From bfc701e286259d9a7aa2ff8240704eab2ba3a237 Mon Sep 17 00:00:00 2001 From: Marcin Zawadzki Date: Sat, 5 Jan 2013 23:03:26 +0100 Subject: Small fix in detecting language. Fixes needed to compile code using clang --- src/app/app.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/app.cpp b/src/app/app.cpp index c936ac1..6930920 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -1472,7 +1472,16 @@ void CApplication::SetLanguage(Language language) if (locale.empty()) { char *envLang = getenv("LANGUAGE"); - if (strncmp(envLang,"en",2) == 0) + if (envLang == NULL) + { + envLang = getenv("LANG"); + } + if (envLang == NULL) + { + GetLogger()->Error("Failed to get language from environment, setting default language"); + m_language = LANGUAGE_ENGLISH; + } + else if (strncmp(envLang,"en",2) == 0) { m_language = LANGUAGE_ENGLISH; } @@ -1484,7 +1493,7 @@ void CApplication::SetLanguage(Language language) { m_language = LANGUAGE_FRENCH; } - else if (strncmp(envLang,"po",2) == 0) + else if (strncmp(envLang,"pl",2) == 0) { m_language = LANGUAGE_POLISH; } -- cgit v1.2.3-1-g7c22 From 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100 Mon Sep 17 00:00:00 2001 From: Emxx52 Date: Sun, 8 Sep 2013 17:05:11 +0200 Subject: Added '-game' launch option --- src/app/app.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/app') diff --git a/src/app/app.cpp b/src/app/app.cpp index f98e0fc..3bcb09d 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -241,6 +241,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) { "loglevel", required_argument, nullptr, OPT_LOGLEVEL }, { "language", required_argument, nullptr, OPT_LANGUAGE }, { "datadir", required_argument, nullptr, OPT_DATADIR }, + { "game", required_argument, nullptr, OPT_DATADIR }, { "langdir", required_argument, nullptr, OPT_LANGDIR }, { "texpack", required_argument, nullptr, OPT_TEXPACK }, { "vbo", required_argument, nullptr, OPT_VBO }, @@ -281,6 +282,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) GetLogger()->Message(" -loglevel level set log level to level (one of: trace, debug, info, warn, error, none)\n"); GetLogger()->Message(" -language lang set language (one of: en, de, fr, pl)\n"); GetLogger()->Message(" -datadir path set custom data directory path\n"); + GetLogger()->Message(" -game modid run mod\n"); GetLogger()->Message(" -langdir path set custom language directory path\n"); GetLogger()->Message(" -texpack path set path to custom texture pack\n"); GetLogger()->Message(" -vbo mode set OpenGL VBO mode (one of: auto, enable, disable)\n"); @@ -344,7 +346,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) case OPT_DATADIR: { m_dataPath = optarg; - GetLogger()->Info("Using custom data dir: '%s'\n", m_dataPath.c_str()); + GetLogger()->Info("Using custom datadir or running mod: '%s'\n", m_dataPath.c_str()); break; } case OPT_LANGDIR: -- cgit v1.2.3-1-g7c22