aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/gnap/scenes/scene08.cpp3
-rw-r--r--engines/gnap/scenes/scene41.cpp4
-rw-r--r--engines/gnap/scenes/scene42.cpp4
-rw-r--r--engines/gnap/scenes/scene43.cpp2
4 files changed, 5 insertions, 8 deletions
diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp
index d01355a44d..4b5c564187 100644
--- a/engines/gnap/scenes/scene08.cpp
+++ b/engines/gnap/scenes/scene08.cpp
@@ -395,9 +395,7 @@ void GnapEngine::scene08_run() {
}
gameUpdateTick();
-
}
-
}
void GnapEngine::scene08_updateAnimations() {
@@ -521,7 +519,6 @@ void GnapEngine::scene08_updateAnimations() {
}
}
}
-
}
} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp
index 92222b5f60..20751129e0 100644
--- a/engines/gnap/scenes/scene41.cpp
+++ b/engines/gnap/scenes/scene41.cpp
@@ -98,7 +98,7 @@ void GnapEngine::scene41_run() {
_gnapActionStatus = kASGiveBackToyUfo;
} else {
if (!isFlag(kGFUnk16) && !isFlag(kGFJointTaken) && !isFlag(kGFUnk18) && !isFlag(kGFGroceryStoreHatTaken))
- toyUfoSetStatus(16);
+ toyUfoSetStatus(kGFUnk16);
_toyUfoX = 600;
_toyUfoY = 200;
}
@@ -547,7 +547,7 @@ void GnapEngine::scene41_updateAnimations() {
kSeqSyncWait, 0, _toyUfoX - 365, _toyUfoY - 128);
_toyUfoSequenceId = _toyUfoNextSequenceId;
_gameSys->setAnimation(_toyUfoNextSequenceId | 0x10000, _toyUfoId, 2);
- toyUfoSetStatus(17);
+ toyUfoSetStatus(kGFJointTaken);
break;
default:
_toyUfoNextSequenceId = toyUfoGetSequenceId();
diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp
index b1cca2b7ba..04f372f56f 100644
--- a/engines/gnap/scenes/scene42.cpp
+++ b/engines/gnap/scenes/scene42.cpp
@@ -108,7 +108,7 @@ void GnapEngine::scene42_run() {
_gameSys->insertSequence(_toyUfoSequenceId | 0x10000, _toyUfoId, 0, 0, kSeqNone, 0, 0, 0);
_toyUfoX = 317;
_toyUfoY = 61;
- toyUfoSetStatus(17);
+ toyUfoSetStatus(kGFJointTaken);
setFlag(kGFPictureTaken);
_timers[9] = 600;
} else {
@@ -465,7 +465,7 @@ void GnapEngine::scene42_updateAnimations() {
_gameSys->insertSequence(0x10870, _toyUfoId, _toyUfoSequenceId | 0x10000, _toyUfoId, kSeqSyncWait, 0, 0, 0);
setFlag(kGFUnk24);
scene42_updateHotspots();
- toyUfoSetStatus(19);
+ toyUfoSetStatus(kGFGroceryStoreHatTaken);
_toyUfoSequenceId = 0x870;
_gameSys->setAnimation(0x10870, _toyUfoId, 3);
_toyUfoActionStatus = -1;
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index a421482ce3..83b11b7697 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -439,7 +439,7 @@ void GnapEngine::scene43_updateAnimations() {
_gameSys->removeSequence(0x1086F, 1, true);
setFlag(kGFUnk14);
scene43_updateHotspots();
- toyUfoSetStatus(18);
+ toyUfoSetStatus(kGFUnk18);
_toyUfoSequenceId = 0x871;
_gameSys->setAnimation(0x10871, _toyUfoId, 3);
_toyUfoActionStatus = -1;