diff options
| author | Filippos Karapetis | 2010-01-30 23:40:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-30 23:40:29 +0000 |
| commit | 4a4b69dbeb8656e9e1bef132afa1bb2c42c378a3 (patch) | |
| tree | 7028617753fe8c5f2fbbfd204064f0bf9c24dd20 /engines/sci/engine | |
| parent | 3d1a43bc5486de8d65b72a5385719e370f159298 (diff) | |
| download | scummvm-rg350-4a4b69dbeb8656e9e1bef132afa1bb2c42c378a3.tar.gz scummvm-rg350-4a4b69dbeb8656e9e1bef132afa1bb2c42c378a3.tar.bz2 scummvm-rg350-4a4b69dbeb8656e9e1bef132afa1bb2c42c378a3.zip | |
Fixed loading of saved games
svn-id: r47729
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 848e2c3ebd..f8eddcdaa2 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -951,8 +951,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { #ifdef ENABLE_SCI32 // Copy the Gui32 pointer over to the new EngineState, if it exists - if (s->_gui32) - retval->_gui32 = s->_gui32; + retval->_gui32 = s->_gui32; #endif // Copy some old data diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index af57bb88e9..984dd1f043 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1043,6 +1043,7 @@ void run_vm(EngineState *s, int restoring) { // place (i.e. menus have been constructed etc). Therefore, inject a kRestoreGame call // here, instead of the requested function. int saveSlot = g_loadFromLauncher; + g_loadFromLauncher = -1; // invalidate slot, so that we don't load again if (saveSlot < 0) error("Requested to load invalid save slot"); // should never happen, really |