diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-09-08 17:55:48 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-09-08 17:55:48 +0200 |
| commit | 39866db50275c4cf1fd4cc1cc6deb2d1573e24d8 (patch) | |
| tree | 4e2c9a25bd517d6f6c6985c2c8778fd6679f3377 | |
| parent | b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d (diff) | |
| parent | 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100 (diff) | |
| download | colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.tar.gz colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.tar.bz2 colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.zip | |
Fixed @Emxx52 's fail :P
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
| -rw-r--r-- | src/app/app.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index f6fe19e..04c028d 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -242,6 +242,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 }, @@ -282,6 +283,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"); @@ -346,7 +348,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[]) { m_dataPath = optarg; m_customDataPath = true; - 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: |