From f0a5e81ac41cc8c65b5db6b8637fab385643e261 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 9 Jan 2013 21:55:34 +0100 Subject: [PATCH 1/3] Disabled travis e-mail notifications --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 660a2f59..6763668c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,5 @@ before_install: - git submodule update --init --recursive - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin +notifications: + email: false From bfc701e286259d9a7aa2ff8240704eab2ba3a237 Mon Sep 17 00:00:00 2001 From: Marcin Zawadzki Date: Sat, 5 Jan 2013 23:03:26 +0100 Subject: [PATCH 2/3] Small fix in detecting language. Fixes needed to compile code using clang --- CMakeLists.txt | 2 +- src/CBot/tests/CBot_console/CMakeLists.txt | 1 - src/app/app.cpp | 13 +++++++++++-- src/common/test/CMakeLists.txt | 1 - src/graphics/engine/test/CMakeLists.txt | 1 - src/graphics/opengl/test/CMakeLists.txt | 1 - src/math/test/CMakeLists.txt | 1 - src/ui/test/CMakeLists.txt | 1 - 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 399ae965..5d0bbebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ endif() # Global compile flags # These are specific to GCC/MinGW; for other compilers, change as necessary -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "-O2") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") diff --git a/src/CBot/tests/CBot_console/CMakeLists.txt b/src/CBot/tests/CBot_console/CMakeLists.txt index 9f0f2444..f76dedf4 100644 --- a/src/CBot/tests/CBot_console/CMakeLists.txt +++ b/src/CBot/tests/CBot_console/CMakeLists.txt @@ -8,7 +8,6 @@ if(NOT CMAKE_BUILD_TYPE) endif(NOT CMAKE_BUILD_TYPE) # Global compile flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_RELEASE "-O2") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") diff --git a/src/app/app.cpp b/src/app/app.cpp index c936ac11..69309203 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; } diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt index 26a31c9b..70dac1f2 100644 --- a/src/common/test/CMakeLists.txt +++ b/src/common/test/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") include_directories( diff --git a/src/graphics/engine/test/CMakeLists.txt b/src/graphics/engine/test/CMakeLists.txt index 46509f4b..c837ae55 100644 --- a/src/graphics/engine/test/CMakeLists.txt +++ b/src/graphics/engine/test/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") set(MODELFILE_TEST_SOURCES diff --git a/src/graphics/opengl/test/CMakeLists.txt b/src/graphics/opengl/test/CMakeLists.txt index 154fec84..79e0ba56 100644 --- a/src/graphics/opengl/test/CMakeLists.txt +++ b/src/graphics/opengl/test/CMakeLists.txt @@ -8,7 +8,6 @@ find_package(PNG REQUIRED) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") set(ADD_LIBS "") diff --git a/src/math/test/CMakeLists.txt b/src/math/test/CMakeLists.txt index dae40188..e31260ce 100644 --- a/src/math/test/CMakeLists.txt +++ b/src/math/test/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") include_directories( diff --git a/src/ui/test/CMakeLists.txt b/src/ui/test/CMakeLists.txt index e411067b..c38d2bb6 100644 --- a/src/ui/test/CMakeLists.txt +++ b/src/ui/test/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") include_directories( From 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100 Mon Sep 17 00:00:00 2001 From: Emxx52 Date: Sun, 8 Sep 2013 17:05:11 +0200 Subject: [PATCH 3/3] Added '-game' launch option --- src/app/app.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index f98e0fc9..3bcb09d4 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: