libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify code.

Browse Source 
svn-id: r35826
This commit is contained in:
Eugene Sandulenko 2009-01-11 12:22:29 +00:00
parent 3172187aff
commit 5cf930eeda
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
base/main.cpp
View File

@ -57,6 +57,11 @@
static bool launcherDialog(OSystem &system) {
// Discard any command line options. Those that affect the graphics
// mode and the others (like bootparam etc.) should not
// blindly be passed to the first game launched from the launcher.
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
#if defined(_WIN32_WCE)
CELauncherDialog dlg;
#elif defined(__DC__)
@ -204,7 +209,7 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
return result;
}
static void setupGraphics(OSystem &system, bool clearDomain = false) {
static void setupGraphics(OSystem &system) {
system.beginGFXTransaction();
// Set the user specified graphics mode (if any).
@ -224,12 +229,6 @@ static void setupGraphics(OSystem &system, bool clearDomain = false) {
// FIXME: Find a nicer way to allow --gui-theme to be working
GUI::GuiManager::instance();
// Discard any command line options. Those that affect the graphics
// mode and the others (like bootparam etc.) should not
// blindly be passed to the first game launched from the launcher.
if (clearDomain)
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
// Set initial window caption
system.setWindowCaption(gScummVMFullVersion);
@ -300,11 +299,8 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
system.getEventManager()->init();
// Unless a game was specified, show the launcher dialog
if (0 == ConfMan.getActiveDomain()) {
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
if (0 == ConfMan.getActiveDomain())
launcherDialog(system);
}
// FIXME: We're now looping the launcher. This, of course, doesn't
// work as well as it should. In theory everything should be destroyed
@ -348,7 +344,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
}
// reset the graphics to default
setupGraphics(system, true);
setupGraphics(system);
launcherDialog(system);
}
PluginManager::instance().unloadPlugins();