diff options
author | Filippos Karapetis | 2010-06-08 21:05:46 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-06-08 21:05:46 +0000 |
commit | 9304b5fbeb4cb3d181d96be6da34073fc5851939 (patch) | |
tree | ab888c3b181054673e1d2374c5b5df4af82fc5d0 /engines/sci/engine/savegame.cpp | |
parent | 641ffa5ee3b8036c1a03fc557d0f9705c824eb3e (diff) | |
download | scummvm-rg350-9304b5fbeb4cb3d181d96be6da34073fc5851939.tar.gz scummvm-rg350-9304b5fbeb4cb3d181d96be6da34073fc5851939.tar.bz2 scummvm-rg350-9304b5fbeb4cb3d181d96be6da34073fc5851939.zip |
Merged the restarting_flags, script_abort_flag, and restoring members of the EngineState class into one variable, abortScriptProcessing. The flag kept to signify a game restart has been placed in a boolean, gameWasRestarted
svn-id: r49518
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
-rw-r--r-- | engines/sci/engine/savegame.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 835ae5b966..d6111146bd 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -880,8 +880,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { s->last_wait_time = g_system->getMillis(); s->game_start_time = g_system->getMillis(); - s->restoring = false; - #ifdef USE_OLD_MUSIC_FUNCTIONS s->_sound._it = NULL; s->_sound._flags = s->_sound._flags; @@ -906,9 +904,7 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { } #endif - - s->restoring = true; - s->script_abort_flag = 2; // Abort current game with replay + s->abortScriptProcessing = kAbortLoadGame; s->shrinkStackToBase(); } |