aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/gnap/gnap.cpp26
-rw-r--r--engines/gnap/scenes/scene13.cpp4
-rw-r--r--engines/gnap/scenes/scene17.cpp40
-rw-r--r--engines/gnap/scenes/scene18.cpp2
-rw-r--r--engines/gnap/scenes/scene19.cpp8
-rw-r--r--engines/gnap/scenes/scene20.cpp8
-rw-r--r--engines/gnap/scenes/scene26.cpp2
-rw-r--r--engines/gnap/scenes/scene28.cpp22
-rw-r--r--engines/gnap/scenes/scene30.cpp12
-rw-r--r--engines/gnap/scenes/scene40.cpp2
-rw-r--r--engines/gnap/scenes/scene41.cpp2
-rw-r--r--engines/gnap/scenes/scene42.cpp10
-rw-r--r--engines/gnap/scenes/scene43.cpp10
-rw-r--r--engines/gnap/scenes/scene44.cpp12
-rw-r--r--engines/gnap/scenes/scene45.cpp18
-rw-r--r--engines/gnap/scenes/scene53.cpp12
-rw-r--r--engines/gnap/scenes/scene54.cpp2
17 files changed, 96 insertions, 96 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index 631f70c333..e408cd821d 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -2175,27 +2175,27 @@ void GnapEngine::playSequences(int fullScreenSpriteId, int sequenceId1, int sequ
}
void GnapEngine::toyUfoSetStatus(int flagNum) {
- clearFlag(16);
- clearFlag(17);
- clearFlag(18);
- clearFlag(19);
+ clearFlag(kGFUnk16);
+ clearFlag(kGFJointTaken);
+ clearFlag(kGFUnk18);
+ clearFlag(kGFGroceryStoreHatTaken);
setFlag(flagNum);
}
int GnapEngine::toyUfoGetSequenceId() {
- if (isFlag(16))
+ if (isFlag(kGFUnk16))
return 0x84E;
- if (isFlag(17))
+ if (isFlag(kGFJointTaken))
return 0x84B;
- if (isFlag(18))
+ if (isFlag(kGFUnk18))
return 0x84D;
- if (isFlag(19))
+ if (isFlag(kGFGroceryStoreHatTaken))
return 0x84C;
return 0x84E;
}
bool GnapEngine::toyUfoCheckTimer() {
- if (!isFlag(kGFGnapControlsToyUFO) || isFlag(18) || _timers[9] ||
+ if (!isFlag(kGFGnapControlsToyUFO) || isFlag(kGFUnk18) || _timers[9] ||
_toyUfoSequenceId == 0x870 || _toyUfoSequenceId == 0x871 || _toyUfoSequenceId == 0x872 || _toyUfoSequenceId == 0x873)
return false;
_sceneDone = true;
@@ -2273,13 +2273,13 @@ void GnapEngine::toyUfoFlyTo(int destX, int destY, int minX, int maxX, int minY,
if (i - 1 > 0) {
int seqId;
- if (isFlag(16))
+ if (isFlag(kGFUnk16))
seqId = 0x867;
- else if (isFlag(17))
+ else if (isFlag(kGFJointTaken))
seqId = 0x84F;
- else if (isFlag(18))
+ else if (isFlag(kGFUnk18))
seqId = 0x85F;
- else if (isFlag(19))
+ else if (isFlag(kGFGroceryStoreHatTaken))
seqId = 0x857;
v16[0].sequenceId = seqId;
v16[0].id = 0;
diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp
index bfffcbdcc9..8a04b2dda9 100644
--- a/engines/gnap/scenes/scene13.cpp
+++ b/engines/gnap/scenes/scene13.cpp
@@ -165,10 +165,10 @@ void GnapEngine::scene13_run() {
gnapWalkTo(2, 7, 0, 0x107C0, 1);
_gnapActionStatus = kASLeaveScene;
platypusWalkTo(2, 8, -1, -1, 1);
- if (isFlag(kGFUnk14) || isFlag(15)) {
+ if (isFlag(kGFUnk14) || isFlag(kGFSpringTaken)) {
_newSceneNum = 11;
} else {
- setFlag(15);
+ setFlag(kGFSpringTaken);
_newSceneNum = 47;
}
break;
diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp
index 8c07a0aff7..fa18a225ac 100644
--- a/engines/gnap/scenes/scene17.cpp
+++ b/engines/gnap/scenes/scene17.cpp
@@ -145,7 +145,7 @@ void GnapEngine::scene17_run() {
}
}
- if (isFlag(19))
+ if (isFlag(kGFGroceryStoreHatTaken))
_gameSys->insertSequence(0x262, 1, 0, 0, kSeqNone, 0, 0, 0);
queueInsertDeviceIcon();
@@ -172,7 +172,7 @@ void GnapEngine::scene17_run() {
_s17_canTryGetWrench = true;
- if (isFlag(18))
+ if (isFlag(kGFUnk18))
_gameSys->insertSequence(0x24F, 100, 0, 0, kSeqNone, 0, 0, 0);
if (_prevSceneNum == 53 || _prevSceneNum == 18 || _prevSceneNum == 20 || _prevSceneNum == 19) {
@@ -192,8 +192,8 @@ void GnapEngine::scene17_run() {
_beaverSequenceId = 0x25A;
_beaverSequenceDatNum = 0;
endSceneInit();
- clearFlag(15);
- clearFlag(16);
+ clearFlag(kGFSpringTaken);
+ clearFlag(kGFUnk16);
_beaverActionStatus = kASPlatPhoningAssistant;
scene17_platHangUpPhone();
_gameSys->setAnimation(0, 0, 4);
@@ -201,8 +201,8 @@ void GnapEngine::scene17_run() {
clearFlag(27);
scene17_updateHotspots();
} else if (isFlag(25)) {
- clearFlag(15);
- clearFlag(16);
+ clearFlag(kGFSpringTaken);
+ clearFlag(kGFUnk16);
initBeaverPos(7, 9, kDirNone);
_gnapX = _hotspotsWalkPos[2].x;
_gnapY = _hotspotsWalkPos[2].y;
@@ -217,8 +217,8 @@ void GnapEngine::scene17_run() {
_gameSys->setAnimation(0x257, 254, 0);
_gameSys->insertSequence(0x257, 254, 0x251, 254, kSeqSyncWait, 0, 0, 0);
} else if (isFlag(26)) {
- clearFlag(15);
- clearFlag(16);
+ clearFlag(kGFSpringTaken);
+ clearFlag(kGFUnk16);
_sceneWaiting = true;
initGnapPos(3, 9, kDirUpLeft);
_platX = _hotspotsWalkPos[2].x;
@@ -240,7 +240,7 @@ void GnapEngine::scene17_run() {
platypusWalkTo(5, 9, -1, 0x107C2, 1);
gnapWalkTo(4, 8, -1, 0x107B9, 1);
} else {
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
initGnapPos(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, kDirBottomRight);
initBeaverPos(1, 9, kDirNone);
endSceneInit();
@@ -249,8 +249,8 @@ void GnapEngine::scene17_run() {
initBeaverPos(1, 7, kDirNone);
endSceneInit();
}
- clearFlag(15);
- clearFlag(16);
+ clearFlag(kGFSpringTaken);
+ clearFlag(kGFUnk16);
endSceneInit();
}
} else {
@@ -372,7 +372,7 @@ void GnapEngine::scene17_run() {
playGnapScratchingHead(1, 3);
break;
case GRAB_CURSOR:
- if (isFlag(18)) {
+ if (isFlag(kGFUnk18)) {
scene17_platHangUpPhone();
gnapWalkTo(_gnapX, _gnapY, 0, getGnapSequenceId(gskIdle, _hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y) | 0x10000, 1);
_gnapActionStatus = kASGetCoinFromPhone;
@@ -383,13 +383,13 @@ void GnapEngine::scene17_run() {
playGnapImpossible(0, 0);
break;
case PLAT_CURSOR:
- if (isFlag(18)) {
+ if (isFlag(kGFUnk18)) {
scene17_platHangUpPhone();
_isLeavingScene = true;
gnapUseDeviceOnBeaver();
_beaverFacing = kDirUpLeft;
platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
- setFlag(16);
+ setFlag(kGFUnk16);
_beaverActionStatus = kASPlatUsePhone;
_gnapActionStatus = kASPlatUsePhone;
} else
@@ -413,13 +413,13 @@ void GnapEngine::scene17_run() {
playGnapScratchingHead(1, 3);
break;
case GRAB_CURSOR:
- if (isFlag(18)) {
+ if (isFlag(kGFUnk18)) {
scene17_platHangUpPhone();
_isLeavingScene = true;
_gnapIdleFacing = kDirUpLeft;
gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
_gnapActionStatus = kASGnapUsePhone;
- setFlag(15);
+ setFlag(kGFSpringTaken);
} else
playGnapImpossible(0, 0);
break;
@@ -427,13 +427,13 @@ void GnapEngine::scene17_run() {
playGnapImpossible(0, 0);
break;
case PLAT_CURSOR:
- if (isFlag(18)) {
+ if (isFlag(kGFUnk18)) {
scene17_platHangUpPhone();
_isLeavingScene = true;
gnapUseDeviceOnBeaver();
_beaverFacing = kDirUpLeft;
platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
- setFlag(16);
+ setFlag(kGFUnk16);
_beaverActionStatus = kASPlatUsePhone;
_gnapActionStatus = kASPlatUsePhone;
} else
@@ -603,7 +603,7 @@ void GnapEngine::scene17_updateAnimations() {
_gameSys->setAnimation(0x250, 100, 0);
_gameSys->insertSequence(0x250, 100, 591, 100, kSeqSyncWait, 0, 0, 0);
invAdd(kItemDiceQuarterHole);
- clearFlag(18);
+ clearFlag(kGFUnk18);
_gnapActionStatus = kASGetCoinFromPhoneDone;
break;
case kASGetCoinFromPhoneDone:
@@ -617,7 +617,7 @@ void GnapEngine::scene17_updateAnimations() {
_gnapSequenceId = 0x24C;
invRemove(kItemDiceQuarterHole);
setGrabCursorSprite(-1);
- setFlag(18);
+ setFlag(kGFUnk18);
_gnapActionStatus = kASPutCoinIntoPhoneDone;
break;
case kASPutCoinIntoPhoneDone:
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index 755a9f7585..3676ada91a 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -640,7 +640,7 @@ void GnapEngine::scene18_run() {
scene18_gnapCarryGarbageCanTo(-1, -1, 0, -1, -1);
scene18_putDownGarbageCan(0);
}
- if (isFlag(20)) {
+ if (isFlag(kGFPictureTaken)) {
playGnapImpossible(0, 0);
} else {
_isLeavingScene = 1;
diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp
index 9dfd69eec5..ba6ab19e48 100644
--- a/engines/gnap/scenes/scene19.cpp
+++ b/engines/gnap/scenes/scene19.cpp
@@ -106,7 +106,7 @@ void GnapEngine::scene19_run() {
_gameSys->insertSequence(0x74, 254, 0, 0, kSeqNone, 0, 0, 0);
_gameSys->insertSequence(0x75, 254, 0, 0, kSeqNone, 0, 0, 0);
- if (!isFlag(20))
+ if (!isFlag(kGFPictureTaken))
_gameSys->insertSequence(0x69, 19, 0, 0, kSeqNone, 0, 0, 0);
if (isFlag(26)) {
@@ -203,7 +203,7 @@ void GnapEngine::scene19_run() {
playGnapScratchingHead(6, 2);
break;
case GRAB_CURSOR:
- if (!isFlag(20)) {
+ if (!isFlag(kGFPictureTaken)) {
gnapWalkTo(_gnapX, _gnapY, 0, getGnapSequenceId(gskIdle, _hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y) | 0x10000, 1);
_gnapActionStatus = kASGrabPicture;
}
@@ -316,7 +316,7 @@ void GnapEngine::scene19_run() {
_timers[6] = getRandom(40) + 50;
if (getRandom(4) != 0) {
_s19_nextShopAssistantSequenceId = 0x64;
- } else if (isFlag(20)) {
+ } else if (isFlag(kGFPictureTaken)) {
_s19_nextShopAssistantSequenceId = 0x64;
} else {
_s19_nextShopAssistantSequenceId = 0x6C;
@@ -373,7 +373,7 @@ void GnapEngine::scene19_updateAnimations() {
_gameSys->setAnimation(0x68, 19, 0);
_gameSys->insertSequence(0x68, 19, 105, 19, kSeqSyncWait, 0, 0, 0);
invAdd(kItemPicture);
- setFlag(20);
+ setFlag(kGFPictureTaken);
scene19_updateHotspots();
_gnapActionStatus = kASGrabPictureDone;
break;
diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp
index dd8dcfbeb5..2301d2994e 100644
--- a/engines/gnap/scenes/scene20.cpp
+++ b/engines/gnap/scenes/scene20.cpp
@@ -96,7 +96,7 @@ void GnapEngine::scene20_updateAnimationsCb() {
_s20_currStonerGuySequenceId = 0x16A;
_s20_nextStonerGuySequenceId = -1;
invAdd(kItemJoint);
- setFlag(17);
+ setFlag(kGFJointTaken);
_s20_stonerGuyShowingJoint = false;
_gnapActionStatus = kASGrabJointDone;
break;
@@ -212,7 +212,7 @@ void GnapEngine::scene20_run() {
_gameSys->insertSequence(0x17C, 20, 0, 0, kSeqNone, 0, 0, 0);
_timers[5] = getRandom(50) + 130;
- if (isFlag(19))
+ if (isFlag(kGFGroceryStoreHatTaken))
_gameSys->insertSequence(0x17F, 20, 0, 0, kSeqNone, 0, 0, 0);
else
_gameSys->insertSequence(0x174, 20, 0, 0, kSeqNone, 0, 0, 0);
@@ -404,7 +404,7 @@ void GnapEngine::scene20_run() {
case TALK_CURSOR:
_gnapIdleFacing = kDirUpRight;
gnapWalkTo(_hotspotsWalkPos[kHSStonerGuy].x, _hotspotsWalkPos[kHSStonerGuy].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
- if (isFlag(17))
+ if (isFlag(kGFJointTaken))
_gnapActionStatus = kASTalkStonerGuyNoJoint;
else
_gnapActionStatus = kASTalkStonerGuyHasJoint;
@@ -639,7 +639,7 @@ void GnapEngine::scene20_updateAnimations() {
break;
case kASSwitchGroceryStoreHatDone:
_gameSys->insertSequence(0x17F, 20, 372, 20, kSeqSyncWait, 0, 0, 0);
- setFlag(19);
+ setFlag(kGFGroceryStoreHatTaken);
hideCursor();
setGrabCursorSprite(-1);
addFullScreenSprite(0x12C, 255);
diff --git a/engines/gnap/scenes/scene26.cpp b/engines/gnap/scenes/scene26.cpp
index fb2e0cca7e..55b5b0774a 100644
--- a/engines/gnap/scenes/scene26.cpp
+++ b/engines/gnap/scenes/scene26.cpp
@@ -43,7 +43,7 @@ enum {
};
int GnapEngine::scene26_init() {
- return isFlag(23) ? 0x61 : 0x60;
+ return isFlag(kGFUnk23) ? 0x61 : 0x60;
}
void GnapEngine::scene26_updateHotspots() {
diff --git a/engines/gnap/scenes/scene28.cpp b/engines/gnap/scenes/scene28.cpp
index a2831e9f5b..d175fdfd24 100644
--- a/engines/gnap/scenes/scene28.cpp
+++ b/engines/gnap/scenes/scene28.cpp
@@ -66,7 +66,7 @@ void GnapEngine::scene28_updateHotspots() {
setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
if (invHas(kItemHorn))
_hotspots[kHSHorn]._flags = SF_DISABLED;
- if (isFlag(22))
+ if (isFlag(kGFUnk22))
_hotspots[kHSEmptyBucket]._flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
_hotspotsCount = 8;
}
@@ -78,11 +78,11 @@ void GnapEngine::scene28_run() {
queueInsertDeviceIcon();
_gameSys->insertSequence(0x124, 255, 0, 0, kSeqNone, 0, 0, 0);
- if (isFlag(22))
+ if (isFlag(kGFUnk22))
_gameSys->insertSequence(0x112, 99, 0, 0, kSeqNone, 0, 0, 0);
if (isFlag(kGFMudTaken)) {
- if (isFlag(21)) {
+ if (isFlag(kGFUnk21)) {
_gameSys->setAnimation(0x11C, 39, 3);
_gameSys->insertSequence(0x11C, 39, 0, 0, kSeqNone, 0, 0, 0);
if (!invHas(kItemHorn))
@@ -170,7 +170,7 @@ void GnapEngine::scene28_run() {
playGnapScratchingHead(2, 4);
break;
case GRAB_CURSOR:
- if (isFlag(21)) {
+ if (isFlag(kGFUnk21)) {
if (!invHas(kItemHorn)) {
gnapWalkTo(_gnapX, _gnapY, 0, getGnapSequenceId(gskIdle, _hotspotsWalkPos[kHSHorn].x, _hotspotsWalkPos[kHSHorn].y) | 0x10000, 1);
_gnapActionStatus = kASGrabHornSuccess;
@@ -195,7 +195,7 @@ void GnapEngine::scene28_run() {
case kHSClown:
if (_gnapActionStatus < 0) {
- if (isFlag(21)) {
+ if (isFlag(kGFUnk21)) {
if (_verbCursor == LOOK_CURSOR)
playGnapScratchingHead(5, 2);
else
@@ -249,7 +249,7 @@ void GnapEngine::scene28_run() {
if (_gnapActionStatus < 0) {
if (_grabCursorSpriteIndex >= 0) {
playGnapShowItem(_grabCursorSpriteIndex, 8, 6);
- } else if (isFlag(21)) {
+ } else if (isFlag(kGFUnk21)) {
playGnapImpossible(8, 6);
} else {
switch (_verbCursor) {
@@ -294,7 +294,7 @@ void GnapEngine::scene28_run() {
updateGnapIdleSequence();
if (!_timers[4]) {
_timers[4] = getRandom(20) + 80;
- if (_gnapActionStatus < 0 && !isFlag(21))
+ if (_gnapActionStatus < 0 && !isFlag(kGFUnk21))
_s28_nextClownSequenceId = 0x114;
}
}
@@ -319,7 +319,7 @@ void GnapEngine::scene28_updateAnimations() {
_gameSys->setAnimation(0, 0, 0);
switch (_gnapActionStatus) {
case kASUseBeerBucketWithClown:
- setFlag(22);
+ setFlag(kGFUnk22);
_s28_nextClownSequenceId = 0x113;
invRemove(kItemBucketWithBeer);
scene28_updateHotspots();
@@ -327,8 +327,8 @@ void GnapEngine::scene28_updateAnimations() {
case kASUsePillBucketWithClown:
_s28_nextClownSequenceId = 0x116;
invRemove(kItemBucketWithPill);
- setFlag(22);
- setFlag(21);
+ setFlag(kGFUnk22);
+ setFlag(kGFUnk21);
scene28_updateHotspots();
break;
case kASGrabHornFails:
@@ -365,7 +365,7 @@ void GnapEngine::scene28_updateAnimations() {
break;
case kASGrabEmptyBucketDone:
setGrabCursorSprite(kItemEmptyBucket);
- clearFlag(22);;
+ clearFlag(kGFUnk22);;
scene28_updateHotspots();
invAdd(kItemEmptyBucket);
_gnapActionStatus = -1;
diff --git a/engines/gnap/scenes/scene30.cpp b/engines/gnap/scenes/scene30.cpp
index cad83ae6dd..6b9504d615 100644
--- a/engines/gnap/scenes/scene30.cpp
+++ b/engines/gnap/scenes/scene30.cpp
@@ -44,7 +44,7 @@ enum {
};
int GnapEngine::scene30_init() {
- return isFlag(23) ? 0x10B : 0x10A;
+ return isFlag(kGFUnk23) ? 0x10B : 0x10A;
}
void GnapEngine::scene30_updateHotspots() {
@@ -64,7 +64,7 @@ void GnapEngine::scene30_run() {
queueInsertDeviceIcon();
- if (isFlag(23))
+ if (isFlag(kGFUnk23))
_gameSys->insertSequence(0x106, 1, 0, 0, kSeqNone, 0, 0, 0);
if (!isFlag(kGFUnk13))
@@ -126,7 +126,7 @@ void GnapEngine::scene30_run() {
case kHSPillMachine:
if (_gnapActionStatus < 0) {
- if (_grabCursorSpriteIndex == kItemDiceQuarterHole && !isFlag(23)) {
+ if (_grabCursorSpriteIndex == kItemDiceQuarterHole && !isFlag(kGFUnk23)) {
_hotspots[kHSWalkArea1]._flags |= SF_WALKABLE;
gnapWalkTo(_hotspotsWalkPos[kHSPillMachine].x, _hotspotsWalkPos[kHSPillMachine].y, 0, 0x107BC, 1);
_hotspots[kHSWalkArea1]._flags &= ~SF_WALKABLE;
@@ -203,7 +203,7 @@ void GnapEngine::scene30_run() {
if (!_timers[5]) {
_timers[5] = getRandom(50) + 180;
if (_gnapActionStatus < 0) {
- if (!isFlag(23) || hasTakenPill)
+ if (!isFlag(kGFUnk23) || hasTakenPill)
_gameSys->insertSequence(0x109, 20, 0, 0, kSeqNone, 0, 0, 0);
else
_gameSys->insertSequence(0x108, 20, 0, 0, kSeqNone, 0, 0, 0);
@@ -257,7 +257,7 @@ void GnapEngine::scene30_updateAnimations() {
showCursor();
_gnapActionStatus = kASUsePillMachine3;
invAdd(kItemPill);
- setFlag(23);
+ setFlag(kGFUnk23);
break;
case kASUsePillMachine3:
_gameSys->setAnimation(0x104, _gnapId, 0);
@@ -273,7 +273,7 @@ void GnapEngine::scene30_updateAnimations() {
_gnapActionStatus = -1;
break;
case kASLookPillMachine:
- if (isFlag(23))
+ if (isFlag(kGFUnk23))
showFullScreenSprite(0xE3);
else
showFullScreenSprite(0xE2);
diff --git a/engines/gnap/scenes/scene40.cpp b/engines/gnap/scenes/scene40.cpp
index 99b62f6330..fe95742f0f 100644
--- a/engines/gnap/scenes/scene40.cpp
+++ b/engines/gnap/scenes/scene40.cpp
@@ -41,7 +41,7 @@ enum {
int GnapEngine::scene40_init() {
_gameSys->setAnimation(0, 0, 0);
_gameSys->setAnimation(0, 0, 1);
- return isFlag(23) ? 0x01 : 0x00;
+ return isFlag(kGFUnk23) ? 0x01 : 0x00;
}
void GnapEngine::scene40_updateHotspots() {
diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp
index 6c50a34706..92222b5f60 100644
--- a/engines/gnap/scenes/scene41.cpp
+++ b/engines/gnap/scenes/scene41.cpp
@@ -97,7 +97,7 @@ void GnapEngine::scene41_run() {
if (!_timers[9])
_gnapActionStatus = kASGiveBackToyUfo;
} else {
- if (!isFlag(16) && !isFlag(17) && !isFlag(18) && !isFlag(19))
+ if (!isFlag(kGFUnk16) && !isFlag(kGFJointTaken) && !isFlag(kGFUnk18) && !isFlag(kGFGroceryStoreHatTaken))
toyUfoSetStatus(16);
_toyUfoX = 600;
_toyUfoY = 200;
diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp
index 94a59e7eb4..7e032e4808 100644
--- a/engines/gnap/scenes/scene42.cpp
+++ b/engines/gnap/scenes/scene42.cpp
@@ -60,7 +60,7 @@ int GnapEngine::scene42_init() {
_gameSys->setAnimation(0, 0, 0);
_gameSys->setAnimation(0, 0, 1);
_gameSys->setAnimation(0, 0, 2);
- if (isFlag(20) || (isFlag(18) && isFlag(23)))
+ if (isFlag(kGFPictureTaken) || (isFlag(kGFUnk18) && isFlag(kGFUnk23)))
return 0x153;
return 0x152;
}
@@ -72,7 +72,7 @@ void GnapEngine::scene42_updateHotspots() {
setHotspot(kHSUfoExitRight, 790, 0, 799, 599, SF_EXIT_R_CURSOR);
setHotspot(kHSUfoHotSauce, 335, 110, 440, 175, SF_DISABLED);
setDeviceHotspot(kHSUfoDevice, -1, 534, -1, 599);
- if ((isFlag(20) || isFlag(18)) && isFlag(23) && !isFlag(24))
+ if ((isFlag(kGFPictureTaken) || isFlag(kGFUnk18)) && isFlag(kGFUnk23) && !isFlag(24))
_hotspots[kHSUfoHotSauce]._flags = SF_GRAB_CURSOR;
_hotspotsCount = 5;
} else {
@@ -102,14 +102,14 @@ void GnapEngine::scene42_run() {
if (isFlag(kGFGnapControlsToyUFO)) {
_toyUfoId = 0;
_toyUfoActionStatus = -1;
- if (_prevSceneNum == 43 && isFlag(18)) {
+ if (_prevSceneNum == 43 && isFlag(kGFUnk18)) {
_toyUfoSequenceId = 0x872;
_toyUfoNextSequenceId = toyUfoGetSequenceId();
_gameSys->insertSequence(_toyUfoSequenceId | 0x10000, _toyUfoId, 0, 0, kSeqNone, 0, 0, 0);
_toyUfoX = 317;
_toyUfoY = 61;
toyUfoSetStatus(17);
- setFlag(20);
+ setFlag(kGFPictureTaken);
_timers[9] = 600;
} else {
_toyUfoSequenceId = toyUfoGetSequenceId();
@@ -180,7 +180,7 @@ void GnapEngine::scene42_run() {
break;
case kHSUfoHotSauce:
- if (isFlag(17)) {
+ if (isFlag(kGFJointTaken)) {
_toyUfoActionStatus = kASToyUfoPickUpHotSauce;
toyUfoFlyTo(384, 77, 0, 799, 0, 300, 3);
_timers[9] = 600;
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index 47931857ed..a421482ce3 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -62,7 +62,7 @@ void GnapEngine::scene43_updateHotspots() {
setHotspot(kHSUfoKey, 140, 170, 185, 260, SF_GRAB_CURSOR);
setHotspot(kHSUfoBucket, 475, 290, 545, 365, SF_DISABLED);
setDeviceHotspot(kHSUfoDevice, -1, 534, -1, 599);
- if (isFlag(19))
+ if (isFlag(kGFGroceryStoreHatTaken))
_hotspots[kHSUfoBucket]._flags = SF_GRAB_CURSOR;
// NOTE Bug in the original. Key hotspot wasn't disabled.
if (isFlag(kGFUnk14))
@@ -184,7 +184,7 @@ void GnapEngine::scene43_run() {
break;
case kHSUfoKey:
- if (isFlag(17)) {
+ if (isFlag(kGFJointTaken)) {
_toyUfoActionStatus = 6;
toyUfoFlyTo(163, 145, 0, 799, 0, 300, 3);
} else {
@@ -328,7 +328,7 @@ void GnapEngine::scene43_run() {
updateBeaverIdleSequence();
if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
updateGnapIdleSequence();
- if (!_timers[4] && (!isFlag(kGFGnapControlsToyUFO) || !isFlag(19))) {
+ if (!_timers[4] && (!isFlag(kGFGnapControlsToyUFO) || !isFlag(kGFGroceryStoreHatTaken))) {
_timers[4] = getRandom(100) + 100;
if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s43_nextTwoHeadedGuySequenceId == -1) {
switch (getRandom(5)) {
@@ -407,7 +407,7 @@ void GnapEngine::scene43_updateAnimations() {
if (_gameSys->getAnimationStatus(2) == 2) {
if (_s43_currTwoHeadedGuySequenceId == 0x13A) {
- if (isFlag(19)) {
+ if (isFlag(kGFGroceryStoreHatTaken)) {
_s43_nextTwoHeadedGuySequenceId = 0x13E;
stopSound(0x108F6);
} else if (getRandom(2) != 0) {
@@ -451,7 +451,7 @@ void GnapEngine::scene43_updateAnimations() {
_toyUfoSequenceId = 0x874;
_gameSys->setAnimation(0x10874, _toyUfoId, 3);
_toyUfoActionStatus = 8;
- setFlag(17);
+ setFlag(kGFJointTaken);
_gnapActionStatus = 3;
break;
case 8:
diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp
index 6e8a12ada8..48dd1fdee1 100644
--- a/engines/gnap/scenes/scene44.cpp
+++ b/engines/gnap/scenes/scene44.cpp
@@ -73,7 +73,7 @@ void GnapEngine::scene44_updateHotspots() {
setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
if (isFlag(kGFUnk13))
_hotspots[kHSKissingLady]._flags = SF_DISABLED;
- if (isFlag(15))
+ if (isFlag(kGFSpringTaken))
_hotspots[kHSSpring]._flags = SF_DISABLED;
_hotspotsCount = 10;
}
@@ -85,7 +85,7 @@ void GnapEngine::scene44_run() {
_gameSys->insertSequence(0xF7, 0, 0, 0, kSeqLoop, 0, 0, 0);
_gameSys->insertSequence(0xFC, 256, 0, 0, kSeqNone, 0, 0, 0);
- if (isFlag(15))
+ if (isFlag(kGFSpringTaken))
_s44_currSpringGuySequenceId = 0xF8;
else
_s44_currSpringGuySequenceId = 0xF9;
@@ -306,7 +306,7 @@ void GnapEngine::scene44_run() {
playGnapUseDevice(8, 0);
_s44_nextSpringGuySequenceId = 0xFB;
invAdd(kItemSpring);
- setFlag(15);
+ setFlag(kGFSpringTaken);
scene44_updateHotspots();
break;
case TALK_CURSOR:
@@ -325,7 +325,7 @@ void GnapEngine::scene44_run() {
} else {
switch (_verbCursor) {
case LOOK_CURSOR:
- if (isFlag(15))
+ if (isFlag(kGFSpringTaken))
playGnapMoan1(8, 7);
else
playGnapScratchingHead(8, 7);
@@ -401,10 +401,10 @@ void GnapEngine::scene44_run() {
_timers[5] = getRandom(20) + 20;
if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s44_nextSpringGuySequenceId == -1) {
if (getRandom(5) != 0) {
- if (!isFlag(15))
+ if (!isFlag(kGFSpringTaken))
_s44_nextSpringGuySequenceId = 0xF9;
} else {
- if (isFlag(15))
+ if (isFlag(kGFSpringTaken))
_s44_nextSpringGuySequenceId = 0xF8;
else
_s44_nextSpringGuySequenceId = 0xFA;
diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp
index 55f6326577..daad788055 100644
--- a/engines/gnap/scenes/scene45.cpp
+++ b/engines/gnap/scenes/scene45.cpp
@@ -50,7 +50,7 @@ int GnapEngine::scene45_init() {
_gameSys->setAnimation(0, 0, 3);
_gameSys->setAnimation(0, 0, 4);
_gameSys->setAnimation(0, 0, 5);
- return isFlag(23) ? 0xA2 : 0xA1;
+ return isFlag(kGFUnk23) ? 0xA2 : 0xA1;
}
void GnapEngine::scene45_updateHotspots() {
@@ -69,14 +69,14 @@ void GnapEngine::scene45_updateHotspots() {
setHotspot(kHSDiscoBall, 370, 10, 470, 125, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 7);
setHotspot(kHSWalkArea1, 0, 0, 800, 472);
setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
- if (isFlag(22)) {
+ if (isFlag(kGFUnk22)) {
_hotspots[kHSPlatypus]._flags = SF_DISABLED;
_hotspots[kHSExitUfoParty]._flags = SF_DISABLED;
_hotspots[kHSExitShoe]._flags = SF_DISABLED;
_hotspots[kHSExitRight]._flags = SF_DISABLED;
_hotspots[kHSExitDiscoBall]._flags = SF_EXIT_U_CURSOR;
}
- if (isFlag(23) || isFlag(22))
+ if (isFlag(kGFUnk23) || isFlag(kGFUnk22))
_hotspots[kHSDiscoBall]._flags = SF_DISABLED;
_hotspotsCount = 8;
}
@@ -109,7 +109,7 @@ void GnapEngine::scene45_run() {
_gameSys->setAnimation(_toyUfoSequenceId | 0x10000, _toyUfoId, 5);
_gameSys->insertSequence(_toyUfoSequenceId | 0x10000, _toyUfoId, 0, 0, kSeqNone, 0, _toyUfoX - 274, _toyUfoY - 128);
endSceneInit();
- } else if (isFlag(22)) {
+ } else if (isFlag(kGFUnk22)) {
_gnapSequenceId = 0x9E;
_gnapSequenceDatNum = 0;
_gnapId = 1;
@@ -138,8 +138,8 @@ void GnapEngine::scene45_run() {
gnapWalkTo(2, 7, -1, 0x107B9, 1);
}
- if (!isFlag(21) && !isFlag(kGFGnapControlsToyUFO)) {
- setFlag(21);
+ if (!isFlag(kGFUnk21) && !isFlag(kGFGnapControlsToyUFO)) {
+ setFlag(kGFUnk21);
setGrabCursorSprite(-1);
_gameSys->setAnimation(0x9D, _gnapId, 0);
_gameSys->insertSequence(0x9D, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
@@ -287,8 +287,8 @@ void GnapEngine::scene45_run() {
break;
case kHSExitDiscoBall:
- clearFlag(22);
- setFlag(23);
+ clearFlag(kGFUnk22);
+ setFlag(kGFUnk23);
_sceneDone = true;
_newSceneNum = 54;
break;
@@ -368,7 +368,7 @@ void GnapEngine::scene45_updateAnimations() {
break;
case 1:
_sceneWaiting = 1;
- setFlag(22);
+ setFlag(kGFUnk22);
scene45_updateHotspots();
_gameSys->insertSequence(0x9E, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
_gnapSequenceId = 0x9E;
diff --git a/engines/gnap/scenes/scene53.cpp b/engines/gnap/scenes/scene53.cpp
index daa39b5424..5d73528282 100644
--- a/engines/gnap/scenes/scene53.cpp
+++ b/engines/gnap/scenes/scene53.cpp
@@ -151,7 +151,7 @@ void GnapEngine::scene53_runChitChatLine() {
}
_gnapActionStatus = -1;
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
_gameSys->insertSequence(0x45, 40, _s53_currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
_s53_currHandSequenceId = 0x45;
} else {
@@ -236,7 +236,7 @@ void GnapEngine::scene53_runChitChatLine() {
_gnapActionStatus = 1;
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
_gameSys->setAnimation(0x73, 40, 6);
_gameSys->insertSequence(0x73, 40, _s53_currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
while (_gameSys->getAnimationStatus(6) != 2) {
@@ -256,7 +256,7 @@ void GnapEngine::scene53_run() {
queueInsertDeviceIcon();
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
_s53_currHandSequenceId = 0x45;
_s53_isGnapPhoning = true;
} else {
@@ -305,7 +305,7 @@ void GnapEngine::scene53_run() {
debug("phoneNumber: %d", phoneNumber);
if (phoneNumberLen == 7) {
_gnapActionStatus = 1;
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
_gameSys->setAnimation(0x73, 40, 6);
_gameSys->insertSequence(0x73, 40, _s53_currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
while (_gameSys->getAnimationStatus(6) != 2) {
@@ -322,7 +322,7 @@ void GnapEngine::scene53_run() {
phoneNumberLen = 0;
_sceneDone = true;
_newSceneNum = 17;
- } else if (phoneNumber != 5556789 || isFlag(20)) {
+ } else if (phoneNumber != 5556789 || isFlag(kGFPictureTaken)) {
scene53_runRandomCall();
phoneNumber = 0;
phoneNumberLen = 0;
@@ -347,7 +347,7 @@ void GnapEngine::scene53_run() {
case 14:
if (_gnapActionStatus < 0) {
_gnapActionStatus = 1;
- if (isFlag(15)) {
+ if (isFlag(kGFSpringTaken)) {
_gameSys->setAnimation(0x73, 40, 6);
_gameSys->insertSequence(0x73, 40, _s53_currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0);
while (_gameSys->getAnimationStatus(6) != 2) {
diff --git a/engines/gnap/scenes/scene54.cpp b/engines/gnap/scenes/scene54.cpp
index 387b17c28c..b6e4be9fcb 100644
--- a/engines/gnap/scenes/scene54.cpp
+++ b/engines/gnap/scenes/scene54.cpp
@@ -36,7 +36,7 @@ void GnapEngine::scene54_initCutscene1() {
_s99_resourceIdArr[0] = 0x3C;
_s99_resourceIdArr[1] = 0x43;
_s99_resourceIdArr[2] = 0x44;
- if (isFlag(20))
+ if (isFlag(kGFPictureTaken))
_s99_resourceIdArr[3] = 0x47;
else
_s99_resourceIdArr[3] = 0x46;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 05:22:16 +0000