X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fmain.cpp;h=7fb429108fba3fcf71ce3a5790ce750c3b9e0234;hb=c5dc3750efbc615b70917f19bb95cbd352cd00f6;hp=4ad68539203a1276274f91976449a7a26f7f8728;hpb=6cbdc43a4b29ac50aa9239adacf63ccc5a68f4f3;p=lugaru.git diff --git a/Source/main.cpp b/Source/main.cpp index 4ad6853..7fb4291 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -581,7 +581,7 @@ const option::Descriptor usage[] = {SOUND, OPENAL_OUTPUT_OSS, "", "force-oss", option::Arg::None, " --force-oss Force use of OSS back-end." }, {OPENALINFO, 0, "", "openal-info", option::Arg::None, " --openal-info Print info about OpenAL at launch." }, {SHOWRESOLUTIONS, 0, "", "showresolutions", option::Arg::None, " --showresolutions List the resolutions found by SDL at launch." }, - {DEBUG, 0, "d", "debug", option::Arg::None, " -d, --debug Activates console, level editor and debug information." }, + {DEVTOOLS, 0, "d", "devtools", option::Arg::None, " -d, --devtools Enable dev tools: console, level editor and debug info." }, {0,0,0,0,0,0} }; @@ -617,8 +617,6 @@ int main(int argc, char **argv) return 1; } - debugmode = commandLineOptions[DEBUG]; - // !!! FIXME: we could use a Win32 API for this. --ryan. #ifndef WIN32 chdirToAppPath(argv[0]); @@ -626,7 +624,7 @@ int main(int argc, char **argv) LOGFUNC; -#ifndef NDEBUG +#ifdef NDEBUG try { #endif { @@ -637,6 +635,10 @@ int main(int argc, char **argv) return 42; } + if (commandLineOptions[DEVTOOLS]) { + devtools = true; + } + bool gameDone = false; bool gameFocused = true; @@ -679,7 +681,7 @@ int main(int argc, char **argv) CleanUp (); return 0; -#ifndef NDEBUG +#ifdef NDEBUG } catch (const std::exception& error) { CleanUp();