immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed @Emxx52 's fail :P 

Merge branch 'master' into dev
Conflicts:
	src/app/app.cpp
dev-ui
krzys-h 2013-09-08 17:55:48 +02:00
parent b5e87aa91f 2891c2ea4c
commit 39866db502
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.cpp
View File

@ -242,6 +242,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
{ "loglevel", required_argument, nullptr, OPT_LOGLEVEL }, { "loglevel", required_argument, nullptr, OPT_LOGLEVEL },
{ "language", required_argument, nullptr, OPT_LANGUAGE }, { "language", required_argument, nullptr, OPT_LANGUAGE },
{ "datadir", required_argument, nullptr, OPT_DATADIR }, { "datadir", required_argument, nullptr, OPT_DATADIR },
{ "game", required_argument, nullptr, OPT_DATADIR },
{ "langdir", required_argument, nullptr, OPT_LANGDIR }, { "langdir", required_argument, nullptr, OPT_LANGDIR },
{ "texpack", required_argument, nullptr, OPT_TEXPACK }, { "texpack", required_argument, nullptr, OPT_TEXPACK },
{ "vbo", required_argument, nullptr, OPT_VBO }, { "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(" -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(" -language lang set language (one of: en, de, fr, pl)\n");
GetLogger()->Message(" -datadir path set custom data directory path\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(" -langdir path set custom language directory path\n");
GetLogger()->Message(" -texpack path set path to custom texture pack\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"); 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_dataPath = optarg;
m_customDataPath = true; 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; break;
} }
case OPT_LANGDIR: case OPT_LANGDIR: