thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some further cleanup in scummvm_main

Browse source 
svn-id: r22352
This commit is contained in:
Max Horn 2006-05-05 00:03:21 +00:00
parent 5e2d023aa8
commit f42baa6dab
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/main.cpp
View file

@ -302,6 +302,10 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
// Update the config file // Update the config file
ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain); ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
// Load and setup the debuglevel and the debug flags. We do this at the
// soonest possible moment to ensure debug output starts early on, if
// requested.
if (settings.contains("debuglevel")) { if (settings.contains("debuglevel")) {
gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10); gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
printf("Debuglevel (from command line): %d\n", gDebugLevel); printf("Debuglevel (from command line): %d\n", gDebugLevel);
@ -309,13 +313,12 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
} else if (ConfMan.hasKey("debuglevel")) } else if (ConfMan.hasKey("debuglevel"))
gDebugLevel = ConfMan.getInt("debuglevel"); gDebugLevel = ConfMan.getInt("debuglevel");
// Look for special debug flags
if (settings.contains("debugflags")) { if (settings.contains("debugflags")) {
specialDebug = settings["debugflags"]; specialDebug = settings["debugflags"];
settings.erase("debugflags"); settings.erase("debugflags");
} }
// Load the plugins // Load the plugins.
PluginManager::instance().loadPlugins(); PluginManager::instance().loadPlugins();
// Process the remaining command line settings. Must be done after the // Process the remaining command line settings. Must be done after the
@ -324,7 +327,8 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
return 0; return 0;
#if defined(__SYMBIAN32__) || defined(_WIN32_WCE) #if defined(__SYMBIAN32__) || defined(_WIN32_WCE)
// init keymap support here: we wanna move this somewhere else? // Init keymap support.
// FIXME: Fingolfin asks: why is this not in your OSystem::initBackend method???
GUI::Actions::init(); GUI::Actions::init();
#endif #endif