aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-04-24 20:36:37 +0200
committerEugene Sandulenko2016-05-10 09:54:21 +0200
commitf3b59a2dfb96fad1610e9169e5858d66b4ebee80 (patch)
treef86fac34ae63def3158b40e7cbb05751868b337a
parentf58874aa45f399344742fa0dc6bc6e36aa9c7552 (diff)
downloadscummvm-rg350-f3b59a2dfb96fad1610e9169e5858d66b4ebee80.tar.gz
scummvm-rg350-f3b59a2dfb96fad1610e9169e5858d66b4ebee80.tar.bz2
scummvm-rg350-f3b59a2dfb96fad1610e9169e5858d66b4ebee80.zip
GNAP: Enforce the use of boolean values for _sceneWaiting
-rw-r--r--engines/gnap/scenes/scene18.cpp2
-rw-r--r--engines/gnap/scenes/scene45.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index 0e17531c91..6f4ef67d07 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -461,7 +461,7 @@ void Scene18::run() {
case kHSCowboyHat:
if (_vm->_gnapActionStatus == kASStandingOnHydrant) {
_vm->_gnapActionStatus = kASGrabCowboyHat;
- _vm->_sceneWaiting = 0;
+ _vm->_sceneWaiting = false;
} else if (_vm->_gnapActionStatus < 0) {
if (_vm->isFlag(kGFPlatyPussDisguised)) {
gnapCarryGarbageCanTo(-1, -1, 0, -1, -1);
diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp
index 2490dddbb5..15722ab7e5 100644
--- a/engines/gnap/scenes/scene45.cpp
+++ b/engines/gnap/scenes/scene45.cpp
@@ -348,7 +348,7 @@ void Scene45::run() {
_vm->gameUpdateTick();
}
- _vm->_sceneWaiting = 0;
+ _vm->_sceneWaiting = false;
}
void Scene45::updateAnimations() {
@@ -359,7 +359,7 @@ void Scene45::updateAnimations() {
_vm->_sceneDone = true;
break;
case 1:
- _vm->_sceneWaiting = 1;
+ _vm->_sceneWaiting = true;
_vm->setFlag(kGFUnk22);
updateHotspots();
_vm->_gameSys->insertSequence(0x9E, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);