diff options
| author | James Brown | 2003-01-12 06:44:59 +0000 |
|---|---|---|
| committer | James Brown | 2003-01-12 06:44:59 +0000 |
| commit | 74f01de444222d3f605fe4d94a7b2ee205138a5d (patch) | |
| tree | 7c9074b2e1ed0348c92ea3fe36725aa66e66e0ed /scumm/scummvm.cpp | |
| parent | 9f60899a4df2bf518d372065c378da99eb7126d4 (diff) | |
| download | scummvm-rg350-74f01de444222d3f605fe4d94a7b2ee205138a5d.tar.gz scummvm-rg350-74f01de444222d3f605fe4d94a7b2ee205138a5d.tar.bz2 scummvm-rg350-74f01de444222d3f605fe4d94a7b2ee205138a5d.zip | |
Fix game-specific scalers overriding global... when game started from Launcher
svn-id: r6414
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index bc60b3f34e..cb8f1d8cb7 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -130,10 +130,18 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) if (prop.cd_num >= 0 && (_features & GF_AUDIOTRACKS)) syst->property(OSystem::PROP_OPEN_CD, &prop); + // Override global fullscreen setting with any game-specific define if (g_config->getBool("fullscreen", false)) { - if (!_system->property(OSystem::PROP_GET_FULLSCREEN, 0)) - _system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0); + if (!syst->property(OSystem::PROP_GET_FULLSCREEN, 0)) + syst->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0); } + + // Override global scaler with any game-specific define + if (g_config->get("gfx_mode")) { + prop.gfx_mode = detector->parseGraphicsMode(g_config->get("gfx_mode")); + syst->property(OSystem::PROP_SET_GFX_MODE, &prop); + } + #ifndef __GP32__ //ph0x FIXME, "quick dirty hack" /* Bind the mixer to the system => mixer will be invoked * automatically when samples need to be generated */ |