diff options
author | Christopher Page | 2008-06-25 02:14:55 +0000 |
---|---|---|
committer | Christopher Page | 2008-06-25 02:14:55 +0000 |
commit | 7d0eb4f4f069beea93f970b2918ad6cf65c2eaa7 (patch) | |
tree | e882df1d4463a177cd598ce579da01c38c0fbb40 | |
parent | e37b0745d362945a017d71e420284021667132f5 (diff) | |
download | scummvm-rg350-7d0eb4f4f069beea93f970b2918ad6cf65c2eaa7.tar.gz scummvm-rg350-7d0eb4f4f069beea93f970b2918ad6cf65c2eaa7.tar.bz2 scummvm-rg350-7d0eb4f4f069beea93f970b2918ad6cf65c2eaa7.zip |
Queen and Saga now use the new _quit flag
svn-id: r32774
-rw-r--r-- | engines/queen/queen.cpp | 4 | ||||
-rw-r--r-- | engines/queen/queen.h | 1 | ||||
-rw-r--r-- | engines/saga/saga.cpp | 3 | ||||
-rw-r--r-- | engines/saga/saga.h | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index c95e44b477..5cd94aa2ae 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -381,7 +381,7 @@ int QueenEngine::go() { loadGameState(ConfMan.getInt("save_slot")); } _lastSaveTime = _lastUpdateTime = _system->getMillis(); - _quit = false; + while (!_quit) { if (_logic->newRoom() > 0) { _logic->update(); @@ -400,7 +400,7 @@ int QueenEngine::go() { update(true); } } - return 0; + return _rtl; } int QueenEngine::init() { diff --git a/engines/queen/queen.h b/engines/queen/queen.h index 0beb557b36..29d568e760 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -137,7 +137,6 @@ protected: int _talkSpeed; bool _subtitles; - bool _quit; uint32 _lastSaveTime; uint32 _lastUpdateTime; diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index fafbd02cec..4f48d1b26e 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -64,7 +64,6 @@ SagaEngine::SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc) _leftMouseButtonPressed = _rightMouseButtonPressed = false; _console = NULL; - _quit = false; _resource = NULL; _sndRes = NULL; @@ -310,7 +309,7 @@ int SagaEngine::go() { _system->delayMillis(10); } - return 0; + return _rtl; } void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) { diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 6b6eb6b3fb..32ab646246 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -610,8 +610,6 @@ public: bool _rightMouseButtonPressed; int _mouseClickCount; - bool _quit; - //current game description int _gameNumber; const SAGAGameDescription *_gameDescription; |