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/sci.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/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 929bdf3307..8d23d5481c 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -219,6 +219,8 @@ Common::Error SciEngine::run() { _gfxCache = cache; _gfxCursor = cursor; + _gamestate->abortScriptProcessing = kAbortNone; + if (game_init(_gamestate)) { /* Initialize */ warning("Game initialization failed: Aborting..."); // TODO: Add an "init failed" error? @@ -264,8 +266,6 @@ Common::Error SciEngine::run() { game_run(&_gamestate); // Run the game - game_exit(_gamestate); - ConfMan.flushToDisk(); delete _gamestate->_soundCmd; |