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/kmisc.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/kmisc.cpp')
-rw-r--r-- | engines/sci/engine/kmisc.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index f91ba0fd82..d90255ab41 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -37,11 +37,9 @@ namespace Sci { reg_t kRestartGame(EngineState *s, int argc, reg_t *argv) { - s->restarting_flags |= SCI_GAME_IS_RESTARTING_NOW; - s->shrinkStackToBase(); - s->script_abort_flag = 1; // Force vm to abort ASAP + s->abortScriptProcessing = kAbortRestartGame; // Force vm to abort ASAP return NULL_REG; } @@ -49,11 +47,11 @@ reg_t kRestartGame(EngineState *s, int argc, reg_t *argv) { ** Returns the restarting_flag in acc */ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) { - s->r_acc = make_reg(0, (s->restarting_flags & SCI_GAME_WAS_RESTARTED)); + s->r_acc = make_reg(0, s->gameWasRestarted); if (argc) { // Only happens during replay if (!argv[0].toUint16()) // Set restarting flag - s->restarting_flags &= ~SCI_GAME_WAS_RESTARTED; + s->gameWasRestarted = false; } uint32 neededSleep = 30; |