From b21089f81c04c83c281cfffac0dbfee9da3cc990 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 10 May 2016 19:59:27 +0200 Subject: GNAP: Rename GetSequence enums --- engines/gnap/character.cpp | 56 +++++++++++++++++++------------------- engines/gnap/gnap.h | 62 +++++++----------------------------------- engines/gnap/scenes/group0.cpp | 62 +++++++++++++++++++++--------------------- engines/gnap/scenes/group1.cpp | 42 ++++++++++++++-------------- engines/gnap/scenes/group2.cpp | 46 +++++++++++++++---------------- engines/gnap/scenes/group3.cpp | 6 ++-- engines/gnap/scenes/group4.cpp | 16 +++++------ 7 files changed, 124 insertions(+), 166 deletions(-) (limited to 'engines/gnap') diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp index 5226c75210..7b55e2b887 100644 --- a/engines/gnap/character.cpp +++ b/engines/gnap/character.cpp @@ -116,7 +116,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { int sequenceId = 0; switch (kind) { - case gskPullOutDevice: + case kGSPullOutDevice: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -153,7 +153,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskPullOutDeviceNonWorking: + case kGSPullOutDeviceNonWorking: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -190,7 +190,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskScratchingHead: + case kGSScratchingHead: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -231,7 +231,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskIdle: + case kGSIdle: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -268,7 +268,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskBrainPulsating: + case kGSBrainPulsating: _brainPulseNum = (_brainPulseNum + 1) & 1; if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { @@ -306,7 +306,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskImpossible: + case kGSImpossible: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -340,7 +340,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskDeflect: + case kGSDeflect: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -380,7 +380,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskUseDevice: + case kGSUseDevice: switch (_idleFacing) { case kDirBottomRight: sequenceId = 0x83A; @@ -400,7 +400,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskMoan1: + case kGSMoan1: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -428,7 +428,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { } break; - case gskMoan2: + case kGSMoan2: if (gridPos.x > 0 && gridPos.y > 0) { if (_pos.y > gridPos.y) { if (_pos.x > gridPos.x) { @@ -488,7 +488,7 @@ void PlayerGnap::useJointOnPlatypus() { _vm->_gameSys->setAnimation(0, 0, 0); _actionStatus = -1; } else { - playSequence(getSequenceId(gskScratchingHead, plat._pos) | 0x10000); + playSequence(getSequenceId(kGSScratchingHead, plat._pos) | 0x10000); } } @@ -519,14 +519,14 @@ void PlayerGnap::kissPlatypus(int callback) { _vm->_gameSys->setAnimation(0, 0, 0); _actionStatus = -1; } else { - playSequence(getSequenceId(gskScratchingHead, plat._pos) | 0x10000); + playSequence(getSequenceId(kGSScratchingHead, plat._pos) | 0x10000); } } void PlayerGnap::useDeviceOnPlatypus() { PlayerPlat& plat = *_vm->_plat; - playSequence(makeRid(1, getSequenceId(gskPullOutDevice, plat._pos))); + playSequence(makeRid(1, getSequenceId(kGSPullOutDevice, plat._pos))); if (plat._idleFacing != kDirNone) { _vm->_gameSys->insertSequence(makeRid(1, 0x7D5), plat._id, @@ -542,7 +542,7 @@ void PlayerGnap::useDeviceOnPlatypus() { plat._sequenceDatNum = 1; } - int newSequenceId = getSequenceId(gskUseDevice, Common::Point(0, 0)); + int newSequenceId = getSequenceId(kGSUseDevice, Common::Point(0, 0)); _vm->_gameSys->insertSequence(makeRid(1, newSequenceId), _id, makeRid(_sequenceDatNum, _sequenceId), _id, kSeqSyncWait, 0, 75 * _pos.x - _gridX, 48 * _pos.y - _gridY); @@ -1024,7 +1024,7 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) { //Skip 29 default: _idleFacing = facing; - sequenceId = getSequenceId(gskImpossible, Common::Point(0, 0)); + sequenceId = getSequenceId(kGSImpossible, Common::Point(0, 0)); break; } @@ -1039,58 +1039,58 @@ void PlayerGnap::idle() { _sequenceId == 0x833 || _sequenceId == 0x834 || _sequenceId == 0x885 || _sequenceId == 0x7A8 || _sequenceId == 0x831 || _sequenceId == 0x89A)) { - _vm->_gameSys->insertSequence(getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, _id, + _vm->_gameSys->insertSequence(getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, _id, makeRid(_sequenceDatNum, _sequenceId), _id, kSeqSyncExists, 0, 75 * _pos.x - _gridX, 48 * _pos.y - _gridY); - _sequenceId = getSequenceId(gskIdle, Common::Point(0, 0)); + _sequenceId = getSequenceId(kGSIdle, Common::Point(0, 0)); _sequenceDatNum = 1; } } void PlayerGnap::actionIdle(int sequenceId) { if (_sequenceId != -1 && ridToDatIndex(sequenceId) == _sequenceDatNum && ridToEntryIndex(sequenceId) == _sequenceId) { - _vm->_gameSys->insertSequence(getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, _id, + _vm->_gameSys->insertSequence(getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, _id, makeRid(_sequenceDatNum, _sequenceId), _id, kSeqSyncExists, 0, 75 * _pos.x - _gridX, 48 * _pos.y - _gridY); - _sequenceId = getSequenceId(gskIdle, Common::Point(0, 0)); + _sequenceId = getSequenceId(kGSIdle, Common::Point(0, 0)); _sequenceDatNum = 1; } } void PlayerGnap::playImpossible(Common::Point gridPos) { - playSequence(getSequenceId(gskImpossible, gridPos) | 0x10000); + playSequence(getSequenceId(kGSImpossible, gridPos) | 0x10000); } void PlayerGnap::playScratchingHead(Common::Point gridPos) { - playSequence(getSequenceId(gskScratchingHead, gridPos) | 0x10000); + playSequence(getSequenceId(kGSScratchingHead, gridPos) | 0x10000); } void PlayerGnap::playMoan1(Common::Point gridPos) { - playSequence(getSequenceId(gskMoan1, gridPos) | 0x10000); + playSequence(getSequenceId(kGSMoan1, gridPos) | 0x10000); } void PlayerGnap::playMoan2(Common::Point gridPos) { - playSequence(getSequenceId(gskMoan2, gridPos) | 0x10000); + playSequence(getSequenceId(kGSMoan2, gridPos) | 0x10000); } void PlayerGnap::playBrainPulsating(Common::Point gridPos) { - playSequence(getSequenceId(gskBrainPulsating, gridPos) | 0x10000); + playSequence(getSequenceId(kGSBrainPulsating, gridPos) | 0x10000); } void PlayerGnap::playPullOutDevice(Common::Point gridPos) { - playSequence(getSequenceId(gskPullOutDevice, gridPos) | 0x10000); + playSequence(getSequenceId(kGSPullOutDevice, gridPos) | 0x10000); } void PlayerGnap::playPullOutDeviceNonWorking(Common::Point gridPos) { - playSequence(getSequenceId(gskPullOutDeviceNonWorking, gridPos) | 0x10000); + playSequence(getSequenceId(kGSPullOutDeviceNonWorking, gridPos) | 0x10000); } void PlayerGnap::playUseDevice(Common::Point gridPos) { - playSequence(getSequenceId(gskUseDevice, gridPos) | 0x10000); + playSequence(getSequenceId(kGSUseDevice, gridPos) | 0x10000); } void PlayerGnap::playIdle(Common::Point gridPos) { - playSequence(getSequenceId(gskIdle, gridPos) | 0x10000); + playSequence(getSequenceId(kGSIdle, gridPos) | 0x10000); } void PlayerGnap::playShowItem(int itemIndex, int gridLookX, int gridLookY) { diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index 0bda4b4706..c7273077a4 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -120,16 +120,16 @@ enum { }; enum { - gskPullOutDevice = 0, - gskPullOutDeviceNonWorking = 1, - gskIdle = 2, - gskBrainPulsating = 3, - gskImpossible = 4, - gskScratchingHead = 5, - gskDeflect = 6, - gskUseDevice = 7, - gskMoan1 = 8, - gskMoan2 = 9 + kGSPullOutDevice = 0, + kGSPullOutDeviceNonWorking = 1, + kGSIdle = 2, + kGSBrainPulsating = 3, + kGSImpossible = 4, + kGSScratchingHead = 5, + kGSDeflect = 6, + kGSUseDevice = 7, + kGSMoan1 = 8, + kGSMoan2 = 9 }; enum { @@ -200,47 +200,6 @@ enum { kGFUnk31 = 31 }; -/* - Game flags - 0 1 With Platypus - 1 2 Mud taken - 2 4 Needle taken - 3 8 Twig taken - 4 0x10 - 5 0x20 Keys taken - 6 0x40 Grass taken - 7 0x80 Barn padlock open - 8 0x100 Truck filled with gas - 9 0x200 Truck keys used - 10 0x400 Platypus disguised - 11 0x800 Scene flag 1 - 12 0x1000 Gnap controls toy ufo - 13 0x2000 - 14 0x4000 - 15 0x8000 Spring taken - 16 0x10000 - 17 0x20000 Joint taken - 18 0x40000 - 19 0x80000 Grocery store hat taken - 20 0x100000 Picture taken - 21 0x200000 - 22 0x400000 - 23 0x800000 - 24 0x1000000 - 25 0x2000000 - 26 0x4000000 Platypus talking with toy shop assistant - 27 0x8000000 - 28 0x10000000 - 29 0x20000000 Gas taken - 30 0x40000000 - 31 0x80000000 -*/ - - // 0x7AB Gnap walks to the right 1 - // 0x7AC Gnap walks to the right 2 - // 0x7AF Gnap walks to the left 1 - // 0x7B0 Gnap walks to the left 2 - struct GnapSavegameHeader { uint8 _version; Common::String _saveName; @@ -263,7 +222,6 @@ private: public: Common::RandomSource *_random; - Common::PEResources *_exe; DatManager *_dat; diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index b0acf8f5bb..f9bc45197a 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -160,7 +160,7 @@ void Scene01::run() { switch (_vm->_verbCursor) { case LOOK_CURSOR: gnap._idleFacing = kDirUpLeft; - if (gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1)) gnap._actionStatus = kAS01LookSpaceship; break; case GRAB_CURSOR: @@ -183,7 +183,7 @@ void Scene01::run() { gnap.playScratchingHead(Common::Point(3, 3)); break; case GRAB_CURSOR: - gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 3)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 3)) | 0x10000, 1); gnap._actionStatus = kAS01TakeMud; break; case TALK_CURSOR: @@ -203,17 +203,17 @@ void Scene01::run() { switch (_vm->_verbCursor) { case LOOK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(7, 2)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(7, 2)) | 0x10000, 1); gnap._actionStatus = kAS01LookPigs; break; case GRAB_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(7, 2)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(7, 2)) | 0x10000, 1); gnap._actionStatus = kAS01UsePigs; break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(7, 2)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(7, 2)) | 0x10000, 1); gnap._actionStatus = kAS01LookPigs; break; case PLAT_CURSOR: @@ -510,7 +510,7 @@ void Scene02::run() { if (_vm->_grabCursorSpriteIndex == kItemTwig) { gnap._idleFacing = kDirUpRight; Common::Point destPos = Common::Point(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1); - gnap.walkTo(destPos, 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(destPos, 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS02UseTwigWithChicken; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1] + Common::Point(0, 1), 9, 8); @@ -521,14 +521,14 @@ void Scene02::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirBottomRight; - if (gnap.walkTo(_vm->_hotspotsWalkPos[1], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[1], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1)) gnap._actionStatus = kAS02GrabChicken; else gnap._actionStatus = -1; break; case TALK_CURSOR: gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[1], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[1], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS02TalkChicken; break; case PLAT_CURSOR: @@ -543,7 +543,7 @@ void Scene02::run() { case kHS02Truck2: if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemKeys) { - if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 2)) | 0x10000, 1)) { + if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 2)) | 0x10000, 1)) { _vm->setGrabCursorSprite(-1); _vm->invRemove(kItemKeys); if (_vm->isFlag(kGFTruckFilledWithGas)) @@ -553,7 +553,7 @@ void Scene02::run() { } } else if (_vm->_grabCursorSpriteIndex == kItemGas) { _vm->_hotspots[kHS02WalkArea4]._flags |= SF_WALKABLE; - if (gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 2)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 2)) | 0x10000, 1)) gnap._actionStatus = kAS02UseGasWithTruck; _vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -565,7 +565,7 @@ void Scene02::run() { break; case GRAB_CURSOR: if (_vm->isFlag(kGFTruckKeysUsed)) { - if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 2)) | 0x10000, 1)) { + if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 2)) | 0x10000, 1)) { if (_vm->isFlag(kGFTruckFilledWithGas)) gnap._actionStatus = kAS02UseTruckGas; else @@ -573,7 +573,7 @@ void Scene02::run() { } } else { gnap._idleFacing = kDirUnk4; - if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(2, 2)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 2)) | 0x10000, 1)) gnap._actionStatus = kAS02UseTruckNoKeys; } break; @@ -597,7 +597,7 @@ void Scene02::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS02GrabTruckGrill; break; case TALK_CURSOR: @@ -1028,7 +1028,7 @@ void Scene03::run() { case GRAB_CURSOR: if (!_vm->isFlag(kGFPlatypus)) _vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE; - if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[3] + Common::Point(1, 1)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[3] + Common::Point(1, 1)) | 0x10000, 1)) gnap._actionStatus = kAS03GrabCreek; if (!_vm->isFlag(kGFPlatypus)) _vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE; @@ -1058,7 +1058,7 @@ void Scene03::run() { gnap.walkTo(Common::Point(7, 6), 0, 0x107B5, 1); gnap._actionStatus = kAS03FreePlatypus; } else { - gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); if (_platypusScared) gnap._actionStatus = kAS03GrabScaredPlatypus; else @@ -1070,7 +1070,7 @@ void Scene03::run() { gnap.playBrainPulsating(Common::Point(8, 4)); } else { gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); if (_platypusScared) gnap._actionStatus = kAS03HypnotizeScaredPlat; else @@ -1519,7 +1519,7 @@ void Scene04::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS04GrabAxe; _vm->setFlag(kGFPlatypusTalkingToAssistant); updateHotspots(); @@ -1547,7 +1547,7 @@ void Scene04::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirBottomRight; - if (gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1)) gnap._actionStatus = kAS04GrabDog; break; case TALK_CURSOR: @@ -1619,7 +1619,7 @@ void Scene04::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - if (gnap.walkTo(_vm->_hotspotsWalkPos[7], 0, gnap.getSequenceId(gskIdle, Common::Point(10, 2)) | 0x10000, 1)) { + if (gnap.walkTo(_vm->_hotspotsWalkPos[7], 0, gnap.getSequenceId(kGSIdle, Common::Point(10, 2)) | 0x10000, 1)) { if (_triedWindow) { gnap._actionStatus = kAS04GetKeyAnother; } else { @@ -1996,7 +1996,7 @@ void Scene05::run() { if (_vm->_grabCursorSpriteIndex == kItemTwig) { gnap._idleFacing = kDirUpRight; Common::Point checkPt = _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot] + Common::Point(0, 1); - gnap.walkTo(checkPt, 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(checkPt, 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS05UseTwigWithChicken; } else if (_vm->_grabCursorSpriteIndex >= 0) gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot] + Common::Point(0, 1), 9, 7); @@ -2007,12 +2007,12 @@ void Scene05::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[5], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[5], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS05GrabChicken; break; case TALK_CURSOR: gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[5], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[5], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS05TalkChicken; break; case PLAT_CURSOR: @@ -2034,7 +2034,7 @@ void Scene05::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirBottomLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS05GrabLadder; break; case TALK_CURSOR: @@ -2059,7 +2059,7 @@ void Scene05::run() { } else if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemNeedle) { if (gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, - gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1)) + gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1)) gnap._actionStatus = kAS05PickPadlock; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 7, 4); @@ -2070,7 +2070,7 @@ void Scene05::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS05TryPickPadlock; break; case TALK_CURSOR: @@ -2469,11 +2469,11 @@ void Scene06::run() { break; case TALK_CURSOR: if (_horseTurnedBack) { - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(3, 2)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(3, 2)) | 0x10000, 1); } else { gnap._idleFacing = kDirBottomLeft; _vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE; - gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); _vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE; gnap._actionStatus = kAS06TalkToHorse; } @@ -2783,10 +2783,10 @@ void Scene07::run() { gnap.playPullOutDevice(Common::Point(3, 3)); gameSys.setAnimation(0x8E, 1, 2); gameSys.insertSequence(0x8E, 1, 141, 1, kSeqSyncWait, 0, 0, 0); - gameSys.insertSequence(gnap.getSequenceId(gskUseDevice, Common::Point(0, 0)) | 0x10000, gnap._id, + gameSys.insertSequence(gnap.getSequenceId(kGSUseDevice, Common::Point(0, 0)) | 0x10000, gnap._id, makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, kSeqSyncWait, 0, 75 * gnap._pos.x - gnap._gridX, 48 * gnap._pos.y - gnap._gridY); - gnap._sequenceId = gnap.getSequenceId(gskUseDevice, Common::Point(0, 0)); + gnap._sequenceId = gnap.getSequenceId(kGSUseDevice, Common::Point(0, 0)); gnap._sequenceDatNum = 1; break; case TALK_CURSOR: @@ -3070,7 +3070,7 @@ void Scene08::run() { case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; gnap.actionIdle(0x14D); - gnap.walkTo(Common::Point(8, 6), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(8, 6), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS08TalkMan; break; case PLAT_CURSOR: @@ -3105,7 +3105,7 @@ void Scene08::run() { case TALK_CURSOR: gnap._idleFacing = kDirUpRight; gnap.actionIdle(0x14D); - gnap.walkTo(Common::Point(4, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(4, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS08TalkDog; break; case PLAT_CURSOR: diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp index 9d6838ec81..0993cf53c4 100644 --- a/engines/gnap/scenes/group1.cpp +++ b/engines/gnap/scenes/group1.cpp @@ -166,7 +166,7 @@ void Scene10::run() { case TALK_CURSOR: gnap._idleFacing = kDirUpRight; gnap.actionIdle(0x10C); - gnap.walkTo(Common::Point(4, 8), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(4, 8), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS10AnnoyCook; break; case PLAT_CURSOR: @@ -259,7 +259,7 @@ void Scene10::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playSequence(gnap.getSequenceId(gskDeflect, Common::Point(10, 5)) | 0x10000); + gnap.playSequence(gnap.getSequenceId(kGSDeflect, Common::Point(10, 5)) | 0x10000); break; case GRAB_CURSOR: gnap.actionIdle(0x10C); @@ -669,7 +669,7 @@ void Scene11::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(Common::Point(3, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(3, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS11TalkGoggleGuy; break; } @@ -687,7 +687,7 @@ void Scene11::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playSequence(gnap.getSequenceId(gskDeflect, Common::Point(3, 6)) | 0x10000); + gnap.playSequence(gnap.getSequenceId(kGSDeflect, Common::Point(3, 6)) | 0x10000); break; case GRAB_CURSOR: gnap.walkTo(Common::Point(5, 6), 0, 0x107BC, 1); @@ -695,7 +695,7 @@ void Scene11::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirBottomLeft; - gnap.walkTo(Common::Point(5, 6), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(5, 6), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS11TalkHookGuy; break; case PLAT_CURSOR: @@ -1085,7 +1085,7 @@ void Scene12::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(Common::Point(3, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(3, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS12TalkToothGuy; break; case PLAT_CURSOR: @@ -1122,7 +1122,7 @@ void Scene12::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(6, 6), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(6, 6), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS12TalkBarkeeper; break; case PLAT_CURSOR: @@ -1155,7 +1155,7 @@ void Scene12::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(7, 6), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(7, 6), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS12TalkBeardGuy; break; case PLAT_CURSOR: @@ -1637,7 +1637,7 @@ void Scene13::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(7, 7), -1, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)), 1); + gnap.walkTo(Common::Point(7, 7), -1, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)), 1); break; case PLAT_CURSOR: gnap.playImpossible(); @@ -1652,7 +1652,7 @@ void Scene13::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playSequence(gnap.getSequenceId(gskDeflect, Common::Point(9, 6))); + gnap.playSequence(gnap.getSequenceId(kGSDeflect, Common::Point(9, 6))); gnap.walkTo(gnap._pos, 0, -1, 1); gnap._actionStatus = kAS13Wait; break; @@ -1674,7 +1674,7 @@ void Scene13::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - gnap.playSequence(gnap.getSequenceId(gskDeflect, Common::Point(5, 9))); + gnap.playSequence(gnap.getSequenceId(kGSDeflect, Common::Point(5, 9))); gnap.walkTo(gnap._pos, 0, -1, 1); gnap._actionStatus = kAS13Wait; break; @@ -2625,7 +2625,7 @@ void Scene17::run() { case kHS17Phone1: if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { - gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS17PutCoinIntoPhone; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 1, 3); @@ -2637,7 +2637,7 @@ void Scene17::run() { case GRAB_CURSOR: if (_vm->isFlag(kGFUnk18)) { platHangUpPhone(); - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1); gnap._actionStatus = kAS17GetCoinFromPhone; } else gnap.playImpossible(); @@ -2666,7 +2666,7 @@ void Scene17::run() { case kHS17Phone2: if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { - gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS17PutCoinIntoPhone; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[2], 1, 3); @@ -2680,7 +2680,7 @@ void Scene17::run() { platHangUpPhone(); _vm->_isLeavingScene = true; gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS17GnapUsePhone; _vm->setFlag(kGFSpringTaken); } else @@ -3520,7 +3520,7 @@ void Scene18::run() { gnap.playScratchingHead(Common::Point(3, 2)); break; case GRAB_CURSOR: - gnap.walkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat], 0, gnap.getSequenceId(gskPullOutDeviceNonWorking, Common::Point(3, 2)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat], 0, gnap.getSequenceId(kGSPullOutDeviceNonWorking, Common::Point(3, 2)) | 0x10000, 1); break; case TALK_CURSOR: case PLAT_CURSOR: @@ -3561,7 +3561,7 @@ void Scene18::run() { if (!_vm->isFlag(kGFTruckKeysUsed)) { gnap.walkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan] + Common::Point((gnap._pos.x < _vm->_s18GarbageCanPos ? 1 : -1), 0), -1, -1, 1); - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, Common::Point(_vm->_s18GarbageCanPos, gnap._pos.y)) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, Common::Point(_vm->_s18GarbageCanPos, gnap._pos.y)) | 0x10000, 1); gnap._actionStatus = kAS18GrabGarbageCanFromStreet; } else if (!_vm->isFlag(kGFTruckFilledWithGas)) { if (gnap.walkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan], 0, -1, 1)) @@ -3616,7 +3616,7 @@ void Scene18::run() { } } else { if (_vm->_grabCursorSpriteIndex == kItemWrench) { - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, Common::Point(2, 8)) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 8)) | 0x10000, 1); gnap._actionStatus = kAS18OpenTopValve; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 1, 5); @@ -3658,7 +3658,7 @@ void Scene18::run() { putDownGarbageCan(0); } if (_vm->_grabCursorSpriteIndex == kItemWrench) { - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, Common::Point(2, 8)) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 8)) | 0x10000, 1); if (_vm->isFlag(kGFTruckKeysUsed)) gnap._actionStatus = kAS18OpenRightValveWithGarbageCan; else @@ -4240,7 +4240,7 @@ void Scene19::run() { break; case GRAB_CURSOR: if (!_vm->isFlag(kGFPictureTaken)) { - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot]) | 0x10000, 1); gnap._actionStatus = kAS19GrabPicture; } break; @@ -4264,7 +4264,7 @@ void Scene19::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS19TalkShopAssistant; break; case GRAB_CURSOR: diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp index ff315c5df7..81bc8c5920 100644 --- a/engines/gnap/scenes/group2.cpp +++ b/engines/gnap/scenes/group2.cpp @@ -374,7 +374,7 @@ void Scene20::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); if (_stonerGuyShowingJoint) gnap._actionStatus = kAS20GrabJoint; else @@ -382,7 +382,7 @@ void Scene20::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); if (_vm->isFlag(kGFJointTaken)) gnap._actionStatus = kAS20TalkStonerGuyNoJoint; else @@ -408,12 +408,12 @@ void Scene20::run() { case GRAB_CURSOR: _stonerGuyShowingJoint = false; gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS20GrabGroceryStoreGuy; break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS20TalkGroceryStoreGuy; break; case PLAT_CURSOR: @@ -428,7 +428,7 @@ void Scene20::run() { if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemCowboyHat) { gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS20SwitchGroceryStoreHat; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 1, 6); @@ -440,7 +440,7 @@ void Scene20::run() { case GRAB_CURSOR: _stonerGuyShowingJoint = false; gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS20GrabGroceryStoreHat; break; case TALK_CURSOR: @@ -629,7 +629,7 @@ void Scene20::updateAnimations() { _vm->showCursor(); _vm->setGrabCursorSprite(kItemGroceryStoreHat); gnap._idleFacing = kDirBottomRight; - gnap.walkTo(Common::Point(3, 8), -1, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(3, 8), -1, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = -1; break; case kAS20GrabJointDone: @@ -830,7 +830,7 @@ void Scene21::run() { gnap.playScratchingHead(Common::Point(2, 5)); break; case GRAB_CURSOR: - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS21Banana]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[kHS21Banana]) | 0x10000, 1); gnap.playPullOutDevice(Common::Point(2, 5)); gnap.playUseDevice(); gnap._actionStatus = kAS21GrabBanana; @@ -847,7 +847,7 @@ void Scene21::run() { if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemGroceryStoreHat) { _vm->_newSceneNum = 47; - gnap.walkTo(Common::Point(4, 6), 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(4, 6), 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS21UseHatWithOldLady; } else if (_vm->_grabCursorSpriteIndex >= 0) { gnap.playShowCurrItem(Common::Point(4, 6), 7, 4); @@ -859,13 +859,13 @@ void Scene21::run() { case GRAB_CURSOR: gnap._idleFacing = kDirUpLeft; _vm->_hotspots[kHS21WalkArea1]._flags |= SF_WALKABLE; - gnap.walkTo(Common::Point(7, 6), 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(7, 6), 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS21GrabOldLady; _vm->_hotspots[kHS21WalkArea1]._flags &= ~SF_WALKABLE; break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS21OldLady], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS21OldLady], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS21TalkOldLady; break; case PLAT_CURSOR: @@ -1173,7 +1173,7 @@ void Scene22::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS22Cashier], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS22Cashier], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS22TalkCashier; break; case PLAT_CURSOR: @@ -1375,7 +1375,7 @@ void Scene23::run() { if (_vm->isFlag(kGFSceneFlag1)) gnap.playMoan2(); else { - gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS23LookCereals; } break; @@ -1384,7 +1384,7 @@ void Scene23::run() { gnap.playImpossible(); else { gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); _vm->setFlag(kGFSceneFlag1); gnap._actionStatus = kAS23GrabCereals; _vm->invAdd(kItemCereals); @@ -1651,7 +1651,7 @@ void Scene24::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS24LeaveScene; plat.walkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity] + Common::Point(1, 0), -1, 0x107C2, 1); } @@ -1889,7 +1889,7 @@ void Scene25::run() { if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemTickets) { gnap._actionStatus = kAS25ShowTicketToVendor; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(gskIdle, Common::Point(9, 4)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(kGSIdle, Common::Point(9, 4)) | 0x10000, 1); gnap.playPullOutDevice(); gnap.playUseDevice(); } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -1903,7 +1903,7 @@ void Scene25::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS25TalkTicketVendor; break; case GRAB_CURSOR: @@ -2456,7 +2456,7 @@ void Scene27::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS27Janitor], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS27Janitor], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS27TalkJanitor; break; case GRAB_CURSOR: @@ -2479,7 +2479,7 @@ void Scene27::run() { break; case GRAB_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS27Bucket]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[kHS27Bucket]) | 0x10000, 1); gnap._actionStatus = kAS27GrabBucket; break; case TALK_CURSOR: @@ -2827,7 +2827,7 @@ void Scene28::run() { case GRAB_CURSOR: if (_vm->isFlag(kGFUnk21)) { if (!_vm->invHas(kItemHorn)) { - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS28Horn]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[kHS28Horn]) | 0x10000, 1); gnap._actionStatus = kAS28GrabHornSuccess; } } else { @@ -2876,7 +2876,7 @@ void Scene28::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(Common::Point(5, 8), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(5, 8), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS28TalkClown; break; case GRAB_CURSOR: @@ -2912,7 +2912,7 @@ void Scene28::run() { gnap.playScratchingHead(Common::Point(8, 6)); break; case GRAB_CURSOR: - gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS28EmptyBucket]) | 0x10000, 1); + gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[kHS28EmptyBucket]) | 0x10000, 1); gnap._actionStatus = kAS28GrabEmptyBucket; break; case TALK_CURSOR: @@ -3213,7 +3213,7 @@ void Scene29::run() { if (gnap._actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemBanana) { gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS29Monkey], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS29Monkey], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS29UseBananaWithMonkey; _vm->_newSceneNum = 51; _vm->_isLeavingScene = true; diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp index 4832ce1dcb..b700d6e2f4 100644 --- a/engines/gnap/scenes/group3.cpp +++ b/engines/gnap/scenes/group3.cpp @@ -419,7 +419,7 @@ void Scene31::run() { if (gnap._actionStatus < 0 || gnap._actionStatus == kAS31PlatMeasuringClown) { if (_vm->_grabCursorSpriteIndex == kItemEmptyBucket && _beerGuyDistracted) { _vm->setGrabCursorSprite(-1); - gnap.walkTo(gnap._pos, -1, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS31BeerBarrel]) | 0x10000, 1); + gnap.walkTo(gnap._pos, -1, gnap.getSequenceId(kGSIdle, _vm->_hotspotsWalkPos[kHS31BeerBarrel]) | 0x10000, 1); _clerkMeasureMaxCtr += 5; gameSys.insertSequence(0xF8, 59, 0, 0, kSeqNone, 0, 0, 0); gnap.playPullOutDevice(Common::Point(6, 8)); @@ -911,14 +911,14 @@ void Scene33::run() { switch (_vm->_verbCursor) { case GRAB_CURSOR: gnap._idleFacing = kDirBottomRight; - if (gnap.walkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1)) + if (gnap.walkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, gnap.getSequenceId(kGSIdle, Common::Point(0, 0)) | 0x10000, 1)) gnap._actionStatus = kAS33UseChicken; else gnap._actionStatus = -1; break; case TALK_CURSOR: gnap._idleFacing = kDirBottomRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS33TalkChicken; break; case LOOK_CURSOR: diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index f6cb57c750..3c67dd6f4b 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -418,7 +418,7 @@ void Scene41::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(4, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(4, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS41TalkToyVendor; break; case PLAT_CURSOR: @@ -447,7 +447,7 @@ void Scene41::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(7, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(7, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); break; case PLAT_CURSOR: gnap.playImpossible(); @@ -932,7 +932,7 @@ void Scene42::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS42TalkBBQVendor; break; case GRAB_CURSOR: @@ -1388,7 +1388,7 @@ void Scene43::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(Common::Point(5, 8), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(Common::Point(5, 8), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = 2; break; case GRAB_CURSOR: @@ -1842,7 +1842,7 @@ void Scene44::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS44KissingLady], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS44KissingLady], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = 1; break; case PLAT_CURSOR: @@ -1896,7 +1896,7 @@ void Scene44::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS44SpringGuy], -1, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS44SpringGuy], -1, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); break; case GRAB_CURSOR: case PLAT_CURSOR: @@ -2637,7 +2637,7 @@ void Scene46::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpLeft; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS46SackGuy], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS46SackGuy], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = 2; break; case GRAB_CURSOR: @@ -2658,7 +2658,7 @@ void Scene46::run() { break; case TALK_CURSOR: gnap._idleFacing = kDirUpRight; - gnap.walkTo(_vm->_hotspotsWalkPos[kHS46ItchyGuy], 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); + gnap.walkTo(_vm->_hotspotsWalkPos[kHS46ItchyGuy], 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = 1; break; case GRAB_CURSOR: -- cgit v1.2.3