thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r49518
This commit is contained in:
Filippos Karapetis 2010-06-08 21:05:46 +00:00
parent 641ffa5ee3
commit 9304b5fbeb
9 changed files with 37 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/engine/savegame.cpp
View file

@ -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();
}