From efa9466c815c6e1eaf913af0211a242d70c50e74 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 10 Apr 2016 21:50:31 +0200 Subject: GNAP: Replace more flags values by enums --- engines/gnap/gnap.cpp | 4 ++-- engines/gnap/menu.cpp | 2 +- engines/gnap/scenes/scene02.cpp | 4 ++-- engines/gnap/scenes/scene04.cpp | 6 +++--- engines/gnap/scenes/scene06.cpp | 10 +++++----- engines/gnap/scenes/scene17.cpp | 18 +++++++++--------- engines/gnap/scenes/scene18.cpp | 30 +++++++++++++++--------------- engines/gnap/scenes/scene19.cpp | 14 +++++++------- engines/gnap/scenes/scene23.cpp | 4 ++-- engines/gnap/scenes/scene32.cpp | 2 +- engines/gnap/scenes/scene33.cpp | 2 +- engines/gnap/scenes/scene42.cpp | 12 ++++++------ engines/gnap/scenes/scene47.cpp | 4 ++-- engines/gnap/scenes/scene53.cpp | 4 ++-- engines/gnap/scenes/scenecore.cpp | 2 +- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index e408cd821d..08b8f95843 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -674,7 +674,7 @@ void GnapEngine::initGameFlags(int num) { invAdd(kItemMagazine); switch (num) { case 1: - setFlag(26); + setFlag(kGFPlatypusTalkingToAssistant); break; case 2: clearFlags(); @@ -702,7 +702,7 @@ void GnapEngine::initGameFlags(int num) { //DEBUG! #if 0 // setFlag(kGFPlatypus); // Enable platypus - setFlag(25); + setFlag(kGFUnk25); invClear(); invAdd(kItemMagazine); #endif diff --git a/engines/gnap/menu.cpp b/engines/gnap/menu.cpp index 8c3bcae16a..e8de9da3e4 100644 --- a/engines/gnap/menu.cpp +++ b/engines/gnap/menu.cpp @@ -634,7 +634,7 @@ void GnapEngine::synchronize(Common::Serializer &s) { s.syncAsUint32LE(_inventory); s.syncAsUint32LE(_gameFlags); - if (s.isLoading() && isFlag(24)) { + if (s.isLoading() && isFlag(kGFUnk24)) { _timers[9] = 600; } } diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp index b285972c98..e1b4d2a135 100644 --- a/engines/gnap/scenes/scene02.cpp +++ b/engines/gnap/scenes/scene02.cpp @@ -119,7 +119,7 @@ void GnapEngine::scene02_run() { _gameSys->waitForUpdate(); break; case 47: - clearFlag(25); + clearFlag(kGFUnk25); initGnapPos(5, 6, kDirBottomLeft); initBeaverPos(6, 7, kDirUnk4); endSceneInit(); @@ -454,7 +454,7 @@ void GnapEngine::scene02_updateAnimations() { } _newSceneNum = 47; _sceneDone = true; - setFlag(25); + setFlag(kGFUnk25); break; case kASGrabTruckGrill: switch (_s02_truckGrillCtr) { diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp index b85bbe7f36..6204971dee 100644 --- a/engines/gnap/scenes/scene04.cpp +++ b/engines/gnap/scenes/scene04.cpp @@ -77,7 +77,7 @@ void GnapEngine::scene04_updateHotspots() { _hotspots[kHSPlatypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; if (isFlag(kGFTwigTaken)) _hotspots[kHSTwig]._flags = SF_WALKABLE | SF_DISABLED; - if (isFlag(26) || _cursorValue == 1) + if (isFlag(kGFPlatypusTalkingToAssistant) || _cursorValue == 1) _hotspots[kHSAxe]._flags = SF_DISABLED; _hotspotsCount = 11; } @@ -99,7 +99,7 @@ void GnapEngine::scene04_run() { _timers[7] = getRandom(150) + 200; _timers[8] = getRandom(150) + 400; - if (!isFlag(26) && _cursorValue == 4) + if (!isFlag(kGFPlatypusTalkingToAssistant) && _cursorValue == 4) _gameSys->insertSequence(0x212, 100, 0, 0, kSeqNone, 0, 0, 0); if (!isFlag(kGFTwigTaken)) @@ -245,7 +245,7 @@ void GnapEngine::scene04_run() { _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabAxe; - setFlag(26); + setFlag(kGFPlatypusTalkingToAssistant); scene04_updateHotspots(); break; case TALK_CURSOR: diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp index 13c6108d7c..c051f800b4 100644 --- a/engines/gnap/scenes/scene06.cpp +++ b/engines/gnap/scenes/scene06.cpp @@ -72,7 +72,7 @@ void GnapEngine::scene06_updateHotspots() { setHotspot(kHSWalkArea4, 475, 469, 800, 505); setHotspot(kHSWalkArea5, 0, 0, 800, 504); setDeviceHotspot(kHSDevice, -1, -1, -1, -1); - if (isFlag(29)) + if (isFlag(kGFGasTaken)) _hotspots[kHSLadder]._flags = SF_DISABLED; if (_cursorValue == 4) { _hotspots[kHSLadder]._flags = SF_DISABLED; @@ -101,7 +101,7 @@ void GnapEngine::scene06_run() { else _gameSys->insertSequence(0xF8, 20, 0, 0, kSeqNone, 0, 0, 0); - if (!isFlag(29) && _cursorValue != 4) + if (!isFlag(kGFGasTaken) && _cursorValue != 4) _gameSys->insertSequence(0xFE, 20, 0, 0, kSeqNone, 0, 0, 0); queueInsertDeviceIcon(); @@ -205,12 +205,12 @@ void GnapEngine::scene06_run() { playGnapScratchingHead(8, 4); break; case GRAB_CURSOR: - if (isFlag(29)) + if (isFlag(kGFGasTaken)) playGnapImpossible(0, 0); else { gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, 0x107BB, 1); _gnapActionStatus = kASTryToClimbLadder; - setFlag(29); + setFlag(kGFGasTaken); } break; case TALK_CURSOR: @@ -382,7 +382,7 @@ void GnapEngine::scene06_updateAnimations() { if (_beaverSequenceId == 0xFA) { _gameSys->setAnimation(0, 0, 1); invAdd(kItemGas); - setFlag(29); + setFlag(kGFGasTaken); _hotspots[kHSLadder]._flags = SF_DISABLED; setGrabCursorSprite(kItemGas); _beaverActionStatus = -1; diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp index fa18a225ac..849e06329c 100644 --- a/engines/gnap/scenes/scene17.cpp +++ b/engines/gnap/scenes/scene17.cpp @@ -74,7 +74,7 @@ void GnapEngine::scene17_updateHotspots() { setDeviceHotspot(kHSDevice, -1, -1, -1, -1); if (isFlag(kGFGrassTaken)) _hotspots[kHSWrench]._flags = SF_NONE; - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { _hotspots[kHSDevice]._flags = SF_DISABLED; _hotspots[kHSPlatypus]._flags = SF_DISABLED; } @@ -109,7 +109,7 @@ void GnapEngine::scene17_platHangUpPhone() { _beaverSequenceDatNum = 0; _s17_currPhoneSequenceId = -1; _s17_nextPhoneSequenceId = -1; - clearFlag(26); + clearFlag(kGFPlatypusTalkingToAssistant); while (_gameSys->getAnimationStatus(1) != 2) gameUpdateTick(); _gnapActionStatus = savedGnapActionStatus; @@ -182,7 +182,7 @@ void GnapEngine::scene17_run() { endSceneInit(); platypusWalkTo(5, 9, -1, 0x107C2, 1); gnapWalkTo(4, 8, -1, 0x107B9, 1); - } else if (isFlag(27)) { + } else if (isFlag(kGFUnk27)) { initGnapPos(3, 9, kDirUpLeft); _platX = _hotspotsWalkPos[2].x; _platY = _hotspotsWalkPos[2].y; @@ -197,10 +197,10 @@ void GnapEngine::scene17_run() { _beaverActionStatus = kASPlatPhoningAssistant; scene17_platHangUpPhone(); _gameSys->setAnimation(0, 0, 4); - clearFlag(26); - clearFlag(27); + clearFlag(kGFPlatypusTalkingToAssistant); + clearFlag(kGFUnk27); scene17_updateHotspots(); - } else if (isFlag(25)) { + } else if (isFlag(kGFUnk25)) { clearFlag(kGFSpringTaken); clearFlag(kGFUnk16); initBeaverPos(7, 9, kDirNone); @@ -211,12 +211,12 @@ void GnapEngine::scene17_run() { _gnapSequenceDatNum = 0; _gnapSequenceId = 601; _gnapActionStatus = kASGnapHangUpPhone; - clearFlag(25); + clearFlag(kGFUnk25); _gameSys->insertSequence(0x251, 254, 0, 0, kSeqNone, 0, 0, 0); endSceneInit(); _gameSys->setAnimation(0x257, 254, 0); _gameSys->insertSequence(0x257, 254, 0x251, 254, kSeqSyncWait, 0, 0, 0); - } else if (isFlag(26)) { + } else if (isFlag(kGFPlatypusTalkingToAssistant)) { clearFlag(kGFSpringTaken); clearFlag(kGFUnk16); _sceneWaiting = true; @@ -683,7 +683,7 @@ void GnapEngine::scene17_updateAnimations() { _beaverSequenceDatNum = 0; _beaverSequenceId = 0x25B; _beaverActionStatus = -1; - clearFlag(26); + clearFlag(kGFPlatypusTalkingToAssistant); _sceneWaiting = false; scene17_updateHotspots(); } else { diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp index 3676ada91a..8faeb64853 100644 --- a/engines/gnap/scenes/scene18.cpp +++ b/engines/gnap/scenes/scene18.cpp @@ -112,7 +112,7 @@ void GnapEngine::scene18_updateHotspots() { } if (isFlag(kGFPlatyPussDisguised)) _hotspots[kHSGarbageCan]._flags = SF_DISABLED; - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { _hotspots[kHSDevice]._flags = SF_DISABLED; _hotspots[kHSHydrantTopValve]._flags = SF_DISABLED; _hotspots[kHSHydrantRightValve]._flags = SF_DISABLED; @@ -258,7 +258,7 @@ void GnapEngine::scene18_putDownGarbageCan(int animationIndex) { } void GnapEngine::scene18_platEndPhoning(bool platFl) { - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { _s18_platPhoneIter = 0; _s18_platPhoneCtr = 0; _beaverActionStatus = -1; @@ -270,7 +270,7 @@ void GnapEngine::scene18_platEndPhoning(bool platFl) { } _gameSys->removeSequence(0x21F, 254, true); _gameSys->setAnimation(0, 0, 3); - clearFlag(26); + clearFlag(kGFPlatypusTalkingToAssistant); if (platFl) { _beaverActionStatus = kASPlatComesHere; _timers[6] = 50; @@ -345,18 +345,18 @@ void GnapEngine::scene18_run() { } } - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { if (_prevSceneNum == 17) initGnapPos(4, 11, kDirBottomRight); else initGnapPos(4, 7, kDirBottomRight); _s18_platPhoneCtr = getRandom(5); - if (isFlag(27)) { + if (isFlag(kGFUnk27)) { _gameSys->insertSequence(0x21E, 254, 0, 0, kSeqNone, 0, 0, 0); endSceneInit(); _s18_currPhoneSequenceId = -1; scene18_platEndPhoning(true); - clearFlag(27); + clearFlag(kGFUnk27); } else { _s18_currPhoneSequenceId = kScene18SequenceIds[_s18_platPhoneCtr]; _s18_platPhoneIter = 0; @@ -364,9 +364,9 @@ void GnapEngine::scene18_run() { _gameSys->insertSequence(_s18_currPhoneSequenceId, 254, 0, 0, kSeqNone, 0, 0, 0); endSceneInit(); } - if (isFlag(27)) { + if (isFlag(kGFUnk27)) { scene18_platEndPhoning(true); - clearFlag(27); + clearFlag(kGFUnk27); } else { _gameSys->setAnimation(_s18_currPhoneSequenceId, 254, 3); } @@ -486,7 +486,7 @@ void GnapEngine::scene18_run() { else playGnapImpossible(0, 0); } else { - if (isFlag(26)) + if (isFlag(kGFPlatypusTalkingToAssistant)) scene18_platEndPhoning(true); if (_grabCursorSpriteIndex >= 0) { if (!isFlag(kGFTruckKeysUsed)) @@ -647,7 +647,7 @@ void GnapEngine::scene18_run() { _newSceneNum = 19; gnapWalkTo(_hotspotsWalkPos[kHSExitToyStore].x, _hotspotsWalkPos[kHSExitToyStore].y, 0, 0x107C0, 1); _gnapActionStatus = kASLeaveScene; - if (!isFlag(26)) + if (!isFlag(kGFPlatypusTalkingToAssistant)) platypusWalkTo(_hotspotsWalkPos[kHSExitToyStore].x + 1, _hotspotsWalkPos[kHSExitToyStore].y, -1, 0x107C2, 1); } } @@ -664,8 +664,8 @@ void GnapEngine::scene18_run() { _newSceneNum = 17; gnapWalkTo(_hotspotsWalkPos[kHSExitPhoneBooth].x, _hotspotsWalkPos[kHSExitPhoneBooth].y, 0, 0x107AE, 1); _gnapActionStatus = kASLeaveScene; - if (isFlag(26)) - setFlag(27); + if (isFlag(kGFPlatypusTalkingToAssistant)) + setFlag(kGFUnk27); else platypusWalkTo(_hotspotsWalkPos[kHSExitPhoneBooth].x + 1, _hotspotsWalkPos[kHSExitPhoneBooth].y, -1, 0x107C2, 1); } @@ -683,7 +683,7 @@ void GnapEngine::scene18_run() { _hotspots[kHSWalkArea2]._flags |= SF_WALKABLE; gnapWalkTo(_hotspotsWalkPos[kHSExitGrubCity].x, _hotspotsWalkPos[kHSExitGrubCity].y, 0, 0x107B2, 1); _gnapActionStatus = kASLeaveScene; - if (isFlag(26)) + if (isFlag(kGFPlatypusTalkingToAssistant)) scene18_platEndPhoning(false); else platypusWalkTo(_hotspotsWalkPos[kHSExitGrubCity].x, _hotspotsWalkPos[kHSExitGrubCity].y - 1, -1, 0x107CF, 1); @@ -730,14 +730,14 @@ void GnapEngine::scene18_run() { playSound(0x22B, true); if (!_isLeavingScene) { - if (!isFlag(26)) { + if (!isFlag(kGFPlatypusTalkingToAssistant)) { if (_beaverActionStatus == kASPlatComesHere) { if (!_timers[6]) { _beaverActionStatus = -1; _sceneWaiting = false; initBeaverPos(-1, 10, kDirNone); platypusWalkTo(3, 9, -1, 0x107C2, 1); - clearFlag(26); + clearFlag(kGFPlatypusTalkingToAssistant); } } else { _hotspots[kHSWalkArea1]._y2 += 48; diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp index ba6ab19e48..da295583f4 100644 --- a/engines/gnap/scenes/scene19.cpp +++ b/engines/gnap/scenes/scene19.cpp @@ -60,7 +60,7 @@ enum { int GnapEngine::scene19_init() { playSound(0x79, 0); - return isFlag(26) ? 0x77 : 0x76; + return isFlag(kGFPlatypusTalkingToAssistant) ? 0x77 : 0x76; } void GnapEngine::scene19_updateHotspots() { @@ -80,7 +80,7 @@ void GnapEngine::scene19_updateHotspots() { setHotspot(kHSWalkArea2, 622, 0, 800, 600); setHotspot(kHSWalkArea3, 0, 0, 800, 437); setDeviceHotspot(kHSDevice, -1, -1, -1, -1); - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { _hotspots[kHSToy1]._flags = SF_DISABLED; _hotspots[kHSToy2]._flags = SF_DISABLED; _hotspots[kHSToy3]._flags = SF_DISABLED; @@ -109,7 +109,7 @@ void GnapEngine::scene19_run() { if (!isFlag(kGFPictureTaken)) _gameSys->insertSequence(0x69, 19, 0, 0, kSeqNone, 0, 0, 0); - if (isFlag(26)) { + if (isFlag(kGFPlatypusTalkingToAssistant)) { initGnapPos(3, 6, kDirBottomRight); _s19_currShopAssistantSequenceId = kS19ShopAssistantSequenceIds[getRandom(5)]; _s19_nextShopAssistantSequenceId = _s19_currShopAssistantSequenceId; @@ -185,8 +185,8 @@ void GnapEngine::scene19_run() { _hotspots[kHSWalkArea1]._flags |= SF_WALKABLE; gnapWalkTo(_hotspotsWalkPos[1].x, _hotspotsWalkPos[1].y, 0, 0x107B2, 1); _gnapActionStatus = kASLeaveScene; - if (isFlag(26)) - setFlag(27); + if (isFlag(kGFPlatypusTalkingToAssistant)) + setFlag(kGFUnk27); else platypusWalkTo(_hotspotsWalkPos[1].x + 1, _hotspotsWalkPos[1].y, -1, 0x107C5, 1); _hotspots[kHSWalkArea1]._flags &= ~SF_WALKABLE; @@ -310,7 +310,7 @@ void GnapEngine::scene19_run() { if (!_isLeavingScene) { updateGnapIdleSequence(); - if (!isFlag(26)) { + if (!isFlag(kGFPlatypusTalkingToAssistant)) { updateBeaverIdleSequence(); if (!_timers[6] && _s19_nextShopAssistantSequenceId == -1) { _timers[6] = getRandom(40) + 50; @@ -387,7 +387,7 @@ void GnapEngine::scene19_updateAnimations() { // checkGameAppStatus(); gameUpdateTick(); } - setFlag(27); + setFlag(kGFUnk27); showCursor(); _newSceneNum = 17; _isLeavingScene = true; diff --git a/engines/gnap/scenes/scene23.cpp b/engines/gnap/scenes/scene23.cpp index 3ad17c5fa2..e3e793962a 100644 --- a/engines/gnap/scenes/scene23.cpp +++ b/engines/gnap/scenes/scene23.cpp @@ -77,14 +77,14 @@ void GnapEngine::scene23_run() { platypusWalkTo(1, 7, -1, 0x107C2, 1); - if (isFlag(24)) { + if (isFlag(kGFUnk24)) { gnapWalkTo(2, 7, -1, 0x107B9, 1); } else { gnapWalkTo(2, 7, 0, 0x107B9, 1); while (_gameSys->getAnimationStatus(0) != 2) gameUpdateTick(); playSequences(0x48, 0xBA, 0xBB, 0xBC); - setFlag(24); + setFlag(kGFUnk24); } while (!_sceneDone) { diff --git a/engines/gnap/scenes/scene32.cpp b/engines/gnap/scenes/scene32.cpp index 5f91b3f0ab..ed735ccef0 100644 --- a/engines/gnap/scenes/scene32.cpp +++ b/engines/gnap/scenes/scene32.cpp @@ -46,7 +46,7 @@ enum { int GnapEngine::scene32_init() { _gameSys->setAnimation(0, 0, 0); - return isFlag(26) ? 0xF : 0x10; + return isFlag(kGFPlatypusTalkingToAssistant) ? 0xF : 0x10; } void GnapEngine::scene32_updateHotspots() { diff --git a/engines/gnap/scenes/scene33.cpp b/engines/gnap/scenes/scene33.cpp index 7e9823ee60..99e9dbc6d4 100644 --- a/engines/gnap/scenes/scene33.cpp +++ b/engines/gnap/scenes/scene33.cpp @@ -46,7 +46,7 @@ enum { }; int GnapEngine::scene33_init() { - return isFlag(26) ? 0x84 : 0x85; + return isFlag(kGFPlatypusTalkingToAssistant) ? 0x84 : 0x85; } void GnapEngine::scene33_updateHotspots() { diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp index 7e032e4808..b1cca2b7ba 100644 --- a/engines/gnap/scenes/scene42.cpp +++ b/engines/gnap/scenes/scene42.cpp @@ -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(kGFPictureTaken) || isFlag(kGFUnk18)) && isFlag(kGFUnk23) && !isFlag(24)) + if ((isFlag(kGFPictureTaken) || isFlag(kGFUnk18)) && isFlag(kGFUnk23) && !isFlag(kGFUnk24)) _hotspots[kHSUfoHotSauce]._flags = SF_GRAB_CURSOR; _hotspotsCount = 5; } else { @@ -392,17 +392,17 @@ void GnapEngine::scene42_updateAnimations() { setGrabCursorSprite(-1); sequenceId = 0x150; _s42_nextBBQVendorSequenceId = 0x148; - } else if (isFlag(27)) { - if (isFlag(28)) { + } else if (isFlag(kGFUnk27)) { + if (isFlag(kGFUnk28)) { sequenceId = 0x7B7; _s42_nextBBQVendorSequenceId = 0x145; } else { - setFlag(28); + setFlag(kGFUnk28); sequenceId = 0x14F; _s42_nextBBQVendorSequenceId = 0x147; } } else { - setFlag(27); + setFlag(kGFUnk27); sequenceId = 0x14E; _s42_nextBBQVendorSequenceId = 0x146; } @@ -463,7 +463,7 @@ void GnapEngine::scene42_updateAnimations() { break; case kASToyUfoPickUpHotSauce: _gameSys->insertSequence(0x10870, _toyUfoId, _toyUfoSequenceId | 0x10000, _toyUfoId, kSeqSyncWait, 0, 0, 0); - setFlag(24); + setFlag(kGFUnk24); scene42_updateHotspots(); toyUfoSetStatus(19); _toyUfoSequenceId = 0x870; diff --git a/engines/gnap/scenes/scene47.cpp b/engines/gnap/scenes/scene47.cpp index 37077e2876..50c8c39f22 100644 --- a/engines/gnap/scenes/scene47.cpp +++ b/engines/gnap/scenes/scene47.cpp @@ -134,7 +134,7 @@ void GnapEngine::scene47_initCutscene7() { _s99_sequenceIdArr[4] = 0x31C; v1 = 5; } - if (!isFlag(26)) + if (!isFlag(kGFPlatypusTalkingToAssistant)) _s99_sequenceIdArr[v1++] = 0x31D; v4 = v1; _s99_sequenceIdArr[v1] = 0x319; @@ -146,7 +146,7 @@ void GnapEngine::scene47_initCutscene7() { v2 = v0 + 1; if (!isFlag(kGFTwigTaken)) _s99_sequenceIdArr[v2++] = 0x31C; - if (!isFlag(26)) + if (!isFlag(kGFPlatypusTalkingToAssistant)) _s99_sequenceIdArr[v2++] = 0x31D; _s99_sequenceIdArr[v2] = 0x313; _s99_sequenceIdArr[v2 + 1] = 0x315; diff --git a/engines/gnap/scenes/scene53.cpp b/engines/gnap/scenes/scene53.cpp index 5d73528282..0b06f55e09 100644 --- a/engines/gnap/scenes/scene53.cpp +++ b/engines/gnap/scenes/scene53.cpp @@ -334,9 +334,9 @@ void GnapEngine::scene53_run() { _sceneDone = true; _newSceneNum = 17; if (_s53_isGnapPhoning) - setFlag(25); + setFlag(kGFUnk25); else - setFlag(26); + setFlag(kGFPlatypusTalkingToAssistant); } } break; diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp index 20d591fa9f..ba1ea40d21 100644 --- a/engines/gnap/scenes/scenecore.cpp +++ b/engines/gnap/scenes/scenecore.cpp @@ -589,7 +589,7 @@ void GnapEngine::runSceneLogic() { scene47_initCutscene2(); _newSceneNum = 11; } else if (!isFlag(kGFPlatyPussDisguised) && _prevSceneNum == 2) {//CHECKME - if (isFlag(25)) { + if (isFlag(kGFUnk25)) { scene47_initCutscene3(); _newSceneNum = 2; } else { -- cgit v1.2.3