diff options
| author | Christopher Page | 2008-08-16 22:06:44 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-16 22:06:44 +0000 |
| commit | 58166351c6420ce1f6f0b7daac4b0ee6f1e43390 (patch) | |
| tree | 0587defef4219bc6e77b1e9c3f38c8fdb75773de | |
| parent | 8e9bbf0e31ce222a31b02cee6edaa932a7bc5ecd (diff) | |
| download | scummvm-rg350-58166351c6420ce1f6f0b7daac4b0ee6f1e43390.tar.gz scummvm-rg350-58166351c6420ce1f6f0b7daac4b0ee6f1e43390.tar.bz2 scummvm-rg350-58166351c6420ce1f6f0b7daac4b0ee6f1e43390.zip | |
Made sure to set the loading slot AFTER selecting the active domain when loading from the launcher. Also fixed the flickering Virgin logo in BASS
svn-id: r33949
| -rw-r--r-- | engines/sky/sky.cpp | 2 | ||||
| -rw-r--r-- | gui/launcher.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index eecc7a9fbf..4f803cb393 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -298,8 +298,6 @@ GUI::Debugger *SkyEngine::getDebugger() { } void SkyEngine::initVirgin() { - - _skyScreen->setPalette(60111); _skyScreen->showScreen(60110); } diff --git a/gui/launcher.cpp b/gui/launcher.cpp index df73df9526..273091a981 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -978,8 +978,8 @@ void LauncherDialog::loadGame(int item) { const char *file = saveList[idx].filename().c_str(); printf("Loading slot: %d\n", slot); printf("Loading file: %s\n", file); - ConfMan.setInt("save_slot", slot); ConfMan.setActiveDomain(_domains[item]); + ConfMan.setInt("save_slot", slot); close(); } } |