diff options
author | Christopher Page | 2008-06-25 01:41:40 +0000 |
---|---|---|
committer | Christopher Page | 2008-06-25 01:41:40 +0000 |
commit | e37b0745d362945a017d71e420284021667132f5 (patch) | |
tree | 9f505e72c0ec6830ca7dd6aeac3df515cd386dbc /engines/parallaction/parallaction_ns.cpp | |
parent | 6e3474896cec0e42c2f5ac7ccb5783981d746fcc (diff) | |
download | scummvm-rg350-e37b0745d362945a017d71e420284021667132f5.tar.gz scummvm-rg350-e37b0745d362945a017d71e420284021667132f5.tar.bz2 scummvm-rg350-e37b0745d362945a017d71e420284021667132f5.zip |
Parallaction now uses the new _quit flag
svn-id: r32773
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index f346a278f7..fb9e51ee26 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -236,20 +236,20 @@ int Parallaction_ns::go() { guiStart(); - if (_engineFlags & kEngineQuit) - return 0; + if (_vm->_quit) + return _rtl; changeLocation(_location._name); - if (_engineFlags & kEngineQuit) - return 0; + if (_vm->_quit) + return _rtl; _input->_inputMode = Input::kInputModeGame; - while ((_engineFlags & kEngineQuit) == 0) { + while (!_vm->_quit) { runGame(); } - return 0; + return _rtl; } void Parallaction_ns::switchBackground(const char* background, const char* mask) { @@ -454,13 +454,13 @@ void Parallaction_ns::cleanupGame() { memset(_locationNames, 0, sizeof(_locationNames)); // this flag tells freeZones to unconditionally remove *all* Zones - _engineFlags |= kEngineQuit; + _vm->_quit = true; freeZones(); freeAnimations(); // this dangerous flag can now be cleared - _engineFlags &= ~kEngineQuit; + _vm->_quit = false; // main character animation is restored _location._animations.push_front(_char._ani); |