aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-06-25 01:41:40 +0000
committerChristopher Page2008-06-25 01:41:40 +0000
commite37b0745d362945a017d71e420284021667132f5 (patch)
tree9f505e72c0ec6830ca7dd6aeac3df515cd386dbc /engines/parallaction/parallaction.cpp
parent6e3474896cec0e42c2f5ac7ccb5783981d746fcc (diff)
downloadscummvm-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.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 25ebe4263d..957a160c34 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -331,7 +331,7 @@ void Parallaction::processInput(InputData *data) {
break;
case kEvQuitGame:
- _engineFlags |= kEngineQuit;
+ _vm->_quit = true;
break;
case kEvSaveGame:
@@ -358,19 +358,19 @@ void Parallaction::runGame() {
processInput(data);
}
- if (_engineFlags & kEngineQuit)
+ if (_vm->_quit)
return;
runPendingZones();
- if (_engineFlags & kEngineQuit)
+ if (_vm->_quit)
return;
if (_engineFlags & kEngineChangeLocation) {
changeLocation(_location._name);
}
- if (_engineFlags & kEngineQuit)
+ if (_vm->_quit)
return;
_gfx->beginFrame();
@@ -466,7 +466,7 @@ ZonePtr Parallaction::findZone(const char *name) {
void Parallaction::freeZones() {
- debugC(2, kDebugExec, "freeZones: kEngineQuit = %i", _engineFlags & kEngineQuit);
+ debugC(2, kDebugExec, "freeZones: _vm->_quit = %i", _vm->_quit);
ZoneList::iterator it = _location._zones.begin();
@@ -475,7 +475,7 @@ void Parallaction::freeZones() {
// NOTE : this condition has been relaxed compared to the original, to allow the engine
// to retain special - needed - zones that were lost across location switches.
ZonePtr z = *it;
- if (((z->_top == -1) || (z->_left == -2)) && ((_engineFlags & kEngineQuit) == 0)) {
+ if (((z->_top == -1) || (z->_left == -2)) && ((_vm->_quit) == 0)) {
debugC(2, kDebugExec, "freeZones preserving zone '%s'", z->_name);
it++;
} else {