diff options
Diffstat (limited to 'engines/gnap')
41 files changed, 351 insertions, 342 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index 548a4362ac..c84583905f 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -890,6 +890,7 @@ void GnapEngine::checkGameKeys() { updatePause(); } // TODO? Debug input + debug("facing %d", _gnapIdleFacing); } void GnapEngine::startSoundTimerA(int timerIndex) { @@ -1026,29 +1027,29 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x83F; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { sequenceId = 0x83D; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = 0x83B; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x839; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x839; break; - case 3: + case kDirBottomLeft: sequenceId = 0x83B; break; - case 7: + case kDirUpRight: sequenceId = 0x83D; break; default: @@ -1063,29 +1064,29 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x829; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { sequenceId = 0x828; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = 0x827; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x826; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x826; break; - case 3: + case kDirBottomLeft: sequenceId = 0x827; break; - case 7: + case kDirUpRight: sequenceId = 0x828; break; default: @@ -1100,37 +1101,37 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x834; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x885; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = 0x834; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x833; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x833; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; break; - case 3: + case kDirBottomLeft: sequenceId = 0x834; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; break; - case 7: + case kDirUpRight: sequenceId = 0x885; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; break; default: sequenceId = 0x834; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; break; } } @@ -1141,29 +1142,29 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x7BC; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { sequenceId = 0x7BB; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = 0x7BA; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7B9; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x7B9; break; - case 3: + case kDirBottomLeft: sequenceId = 0x7BA; break; - case 7: + case kDirUpRight: sequenceId = 0x7BB; break; default: @@ -1179,29 +1180,29 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x812; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7FE; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7D6; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7EA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7EA; break; - case 3: + case kDirBottomLeft: sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7D6; break; - case 7: + case kDirUpRight: sequenceId = _gnapBrainPulseRndValue + _gnapBrainPulseNum + 0x7FE; break; default: @@ -1216,32 +1217,32 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x831; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7A8; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } else { if (_gnapX > gridX) { sequenceId = 0x831; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { if (_gnapX % 2) sequenceId = 0x7A8; else sequenceId = 0x89A; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } - } else if (_gnapIdleFacing != 1 && _gnapIdleFacing != 7) { + } else if (_gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) { sequenceId = 0x831; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { if (_currentSceneNum % 2) sequenceId = 0x7A8; else sequenceId = 0x89A; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } break; @@ -1250,32 +1251,32 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x830; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { sequenceId = 0x82F; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } } else { if (_gnapX > gridX) { sequenceId = 0x82E; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7A7; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } } else { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x7A7; break; - case 3: + case kDirBottomLeft: sequenceId = 0x82E; break; - case 5: + case kDirUpLeft: sequenceId = 0x830; break; - case 7: + case kDirUpRight: sequenceId = 0x82F; break; } @@ -1284,16 +1285,16 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { case gskUseDevice: switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: sequenceId = 0x83A; break; - case 3: + case kDirBottomLeft: sequenceId = 0x83C; break; - case 5: + case kDirUpLeft: sequenceId = 0x840; break; - case 7: + case kDirUpRight: sequenceId = 0x83E; break; } @@ -1304,26 +1305,26 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } else { if (_gnapX > gridX) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } - } else if (_gnapIdleFacing != 1 && _gnapIdleFacing != 7) { + } else if (_gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } break; @@ -1332,26 +1333,26 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { if (_gnapY > gridY) { if (_gnapX > gridX) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } else { if (_gnapX > gridX) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } } - } else if (_gnapIdleFacing != 1 && _gnapIdleFacing != 7) { + } else if (_gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) { sequenceId = 0x832; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; } else { sequenceId = 0x7AA; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } break; } @@ -1361,120 +1362,120 @@ int GnapEngine::getGnapSequenceId(int kind, int gridX, int gridY) { int GnapEngine::getGnapShowSequenceId(int index, int gridX, int gridY) { int sequenceId; - int facing = _gnapIdleFacing; + Facing facing = _gnapIdleFacing; if (gridY > 0 && gridX > 0) { if (_gnapY > gridY) { if (_gnapX > gridX) - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; else - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } else { if (_gnapX > gridX) - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; else - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } - } else if (_gnapIdleFacing != 1 && _gnapIdleFacing != 7) { - _gnapIdleFacing = 5; + } else if (_gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) { + _gnapIdleFacing = kDirUpLeft; } else { - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } switch (index) { case 0: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x8A0; else sequenceId = 0x8A1; break; case 1: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x880; else sequenceId = 0x895; break; case 2: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x884; else sequenceId = 0x899; break; //Skip 3 case 4: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x881; else sequenceId = 0x896; break; case 5: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x883; else sequenceId = 0x898; break; case 6: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87E; else sequenceId = 0x893; break; case 7: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x848; else sequenceId = 0x890; break; case 8: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87D; else sequenceId = 0x892; break; case 9: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x882; else sequenceId = 0x897; break; case 10: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87C; else sequenceId = 0x891; break; case 11: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87C; else sequenceId = 0x891; break; case 12: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87D; else sequenceId = 0x892; break; case 13: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x888; else sequenceId = 0x89D; break; case 14: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87F; else sequenceId = 0x894; break; case 15: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87B; else sequenceId = 0x8A3; break; case 16: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x877; else sequenceId = 0x88C; @@ -1484,43 +1485,43 @@ int GnapEngine::getGnapShowSequenceId(int index, int gridX, int gridY) { sequenceId = 0x887; break; case 19: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87A; else sequenceId = 0x88F; break; case 20: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x878; else sequenceId = 0x88D; break; case 21: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x879; else sequenceId = 0x88E; break; case 22: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x88A; else sequenceId = 0x89F; break; case 23: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x889; else sequenceId = 0x89E; break; case 24: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x886; else sequenceId = 0x89B; break; case 25: - if (_gnapIdleFacing == 7) + if (_gnapIdleFacing == kDirUpRight) sequenceId = 0x87A; else sequenceId = 0x88F; @@ -1629,7 +1630,7 @@ void GnapEngine::updateGnapIdleSequence() { if (_timers[3] == 0) { _timers[2] = 60; _timers[3] = 300; - if (_gnapIdleFacing == 1) { + if (_gnapIdleFacing == kDirBottomRight) { switch (getRandom(5)) { case 0: playGnapSequence(0x107A6); @@ -1644,7 +1645,7 @@ void GnapEngine::updateGnapIdleSequence() { playGnapSequence(0x108A2); break; } - } else if (_gnapIdleFacing == 3) { + } else if (_gnapIdleFacing == kDirBottomLeft) { if (getRandom(5) > 2) playGnapSequence(0x10832); else @@ -1653,13 +1654,13 @@ void GnapEngine::updateGnapIdleSequence() { } } else { _timers[2] = getRandom(30) + 20; - if (_gnapIdleFacing == 1) { + if (_gnapIdleFacing == kDirBottomRight) { _gameSys->insertSequence(0x107BD, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); _gnapSequenceId = 0x7BD; _gnapSequenceDatNum = 1; - } else if (_gnapIdleFacing == 3) { + } else if (_gnapIdleFacing == kDirBottomLeft) { _gameSys->insertSequence(0x107BE, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); @@ -1679,21 +1680,21 @@ void GnapEngine::updateGnapIdleSequence2() { if (_timers[3] == 0) { _timers[2] = 60; _timers[3] = 300; - if (_gnapIdleFacing == 1) { + if (_gnapIdleFacing == kDirBottomRight) { playGnapSequence(0x107AA); - } else if (_gnapIdleFacing == 3) { + } else if (_gnapIdleFacing == kDirBottomLeft) { playGnapSequence(0x10832); } } } else { _timers[2] = getRandom(30) + 20; - if (_gnapIdleFacing == 1) { + if (_gnapIdleFacing == kDirBottomRight) { _gameSys->insertSequence(0x107BD, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); _gnapSequenceId = 0x7BD; _gnapSequenceDatNum = 1; - } else if (_gnapIdleFacing == 3) { + } else if (_gnapIdleFacing == kDirBottomLeft) { _gameSys->insertSequence(0x107BE, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); @@ -1721,20 +1722,20 @@ bool GnapEngine::testWalk(int animationIndex, int someStatus, int gridX1, int gr return false; } -void GnapEngine::initGnapPos(int gridX, int gridY, int facing) { +void GnapEngine::initGnapPos(int gridX, int gridY, Facing facing) { _timers[2] = 30; _timers[3] = 300; _gnapX = gridX; _gnapY = gridY; - if (facing <= 0) - _gnapIdleFacing = 1; + if (facing == kDirNone) + _gnapIdleFacing = kDirBottomRight; else _gnapIdleFacing = facing; - if (_gnapIdleFacing == 3) { + if (_gnapIdleFacing == kDirBottomLeft) { _gnapSequenceId = 0x7B8; } else { _gnapSequenceId = 0x7B5; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } _gnapId = 20 * _gnapY; _gnapSequenceDatNum = 1; diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index d376ffd5c9..2872f69f20 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -235,6 +235,15 @@ struct Scene51Item { int _id; }; +enum Facing { + kDirNone = 0, + kDirBottomRight = 1, + kDirBottomLeft = 3, + kDirUnk4 = 4, + kDirUpLeft = 5, + kDirUpRight = 7 +}; + class GnapEngine : public Engine { protected: Common::Error run(); @@ -458,7 +467,7 @@ public: int getGnapWalkSequenceId(int deltaX, int deltaY); int getGnapWalkStopSequenceId(int deltaX, int deltaY); - int getGnapWalkFacing(int deltaX, int deltaY); + Facing getGnapWalkFacing(int deltaX, int deltaY); bool gridSub41F08B(int gridX, int gridY); bool gridSub41F5FC(int gridX, int gridY, int index); bool gridSub41FAD5(int gridX, int gridY, int index); @@ -483,7 +492,7 @@ public: void beaverMakeRoom(); // Gnap - int _gnapIdleFacing; + Facing _gnapIdleFacing; int _gnapActionStatus; int _gnapBrainPulseNum, _gnapBrainPulseRndValue; int _gnapSequenceId, _gnapSequenceDatNum, _gnapId; @@ -506,7 +515,7 @@ public: void playGnapShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY); void updateGnapIdleSequence(); void updateGnapIdleSequence2(); - void initGnapPos(int gridX, int gridY, int facing); + void initGnapPos(int gridX, int gridY, Facing facing); void gnapInitBrainPulseRndValue(); void gnapUseDeviceOnBeaver(); void doCallback(int callback); diff --git a/engines/gnap/grid.cpp b/engines/gnap/grid.cpp index 5b2f5aa454..136e8d429e 100644 --- a/engines/gnap/grid.cpp +++ b/engines/gnap/grid.cpp @@ -58,11 +58,11 @@ int GnapEngine::getGnapWalkStopSequenceId(int deltaX, int deltaY) { return _gnapWalkStopSequenceIds[3 * deltaX + 3 + 1 + deltaY]; } -int GnapEngine::getGnapWalkFacing(int deltaX, int deltaY) { - static const int _gnapWalkFacings[9] = { - 5, 3, 3, - 5, 0, 3, - 7, 1, 1 +Facing GnapEngine::getGnapWalkFacing(int deltaX, int deltaY) { + static const Facing _gnapWalkFacings[9] = { + kDirUpLeft, kDirBottomLeft, kDirBottomLeft, + kDirUpLeft, kDirNone, kDirBottomLeft, + kDirUpRight, kDirBottomRight, kDirBottomRight }; // CHECKME This is a little weird return _gnapWalkFacings[3 * deltaX + 3 + 1 + deltaY]; @@ -645,17 +645,17 @@ bool GnapEngine::gnapWalkTo(int gridX, int gridY, int animationIndex, int sequen _gnapSequenceId = ridToEntryIndex(sequenceId); _gnapSequenceDatNum = ridToDatIndex(sequenceId); if (_gnapSequenceId == 0x7B9) { - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; } else { switch (_gnapSequenceId) { case 0x7BA: - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; break; case 0x7BB: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; break; case 0x7BC: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; break; } } @@ -665,13 +665,13 @@ bool GnapEngine::gnapWalkTo(int gridX, int gridY, int animationIndex, int sequen _gnapIdleFacing = getGnapWalkFacing(_gnapWalkNodes[_gnapWalkNodesCount - 1].deltaX, _gnapWalkNodes[_gnapWalkNodesCount - 1].deltaY); } else if (gridX >= 0 || gridY >= 0) { switch (_gnapIdleFacing) { - case 1: + case kDirBottomRight: _gnapSequenceId = 0x7B9; break; - case 3: + case kDirBottomLeft: _gnapSequenceId = 0x7BA; break; - case 7: + case kDirUpRight: _gnapSequenceId = 0x7BB; break; default: diff --git a/engines/gnap/scenes/scene01.cpp b/engines/gnap/scenes/scene01.cpp index 9efe45d5ae..ba906b601b 100644 --- a/engines/gnap/scenes/scene01.cpp +++ b/engines/gnap/scenes/scene01.cpp @@ -102,7 +102,7 @@ void GnapEngine::scene01_run() { queueInsertDeviceIcon(); if (_prevSceneNum == 2) { - initGnapPos(11, 6, 3); + initGnapPos(11, 6, kDirBottomLeft); if (isFlag(0)) initBeaverPos(12, 6, 4); endSceneInit(); @@ -110,7 +110,7 @@ void GnapEngine::scene01_run() { platypusWalkTo(9, 6, -1, 0x107C2, 1); gnapWalkTo(8, 6, -1, 0x107B9, 1); } else { - initGnapPos(1, 6, 1); + initGnapPos(1, 6, kDirBottomRight); if (isFlag(0)) initBeaverPos(1, 7, 0); endSceneInit(); @@ -170,7 +170,7 @@ void GnapEngine::scene01_run() { } else { switch (_verbCursor) { case LOOK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; if (gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _gnapActionStatus = kASLookSpaceship; break; @@ -213,17 +213,17 @@ void GnapEngine::scene01_run() { } else { switch (_verbCursor) { case LOOK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1); _gnapActionStatus = kASLookPigs; break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1); _gnapActionStatus = kASUsePigs; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskBrainPulsating, 7, 2) | 0x10000, 1); _gnapActionStatus = kASLookPigs; break; diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp index cd72020d94..5d254870da 100644 --- a/engines/gnap/scenes/scene02.cpp +++ b/engines/gnap/scenes/scene02.cpp @@ -84,7 +84,6 @@ void GnapEngine::scene02_updateHotspots() { } void GnapEngine::scene02_run() { - playSound(0x1091C, 1); startSoundTimerC(6); @@ -100,7 +99,7 @@ void GnapEngine::scene02_run() { switch (_prevSceneNum) { case 3: - initGnapPos(11, 6, 3); + initGnapPos(11, 6, kDirBottomLeft); if (isFlag(0)) initBeaverPos(12, 6, 4); endSceneInit(); @@ -109,7 +108,7 @@ void GnapEngine::scene02_run() { gnapWalkTo(8, 6, -1, 0x107BA, 1); break; case 4: - initGnapPos(_hotspotsWalkPos[6].x, _hotspotsWalkPos[6].y, 3); + initGnapPos(_hotspotsWalkPos[6].x, _hotspotsWalkPos[6].y, kDirBottomLeft); if (isFlag(0)) initBeaverPos(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, 4); endSceneInit(); @@ -121,18 +120,18 @@ void GnapEngine::scene02_run() { break; case 47: clearFlag(25); - initGnapPos(5, 6, 3); + initGnapPos(5, 6, kDirBottomLeft); initBeaverPos(6, 7, 4); endSceneInit(); break; case 49: - initGnapPos(5, 6, 1); + initGnapPos(5, 6, kDirBottomRight); if (isFlag(0)) initBeaverPos(6, 7, 0); endSceneInit(); break; default: - initGnapPos(-1, 6, 1); + initGnapPos(-1, 6, kDirBottomRight); if (isFlag(0)) initBeaverPos(-1, 7, 0); endSceneInit(); @@ -194,7 +193,7 @@ void GnapEngine::scene02_run() { case kHSChicken: if (_gnapActionStatus < 0) { if (_grabCursorSpriteIndex == kItemTwig) { - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y + 1, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASUseTwigWithChicken; @@ -206,14 +205,14 @@ void GnapEngine::scene02_run() { playGnapMoan2(9, 8); break; case GRAB_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; if (gnapWalkTo(_hotspotsWalkPos[1].x, _hotspotsWalkPos[1].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _gnapActionStatus = kASGrabChicken; else _gnapActionStatus = -1; break; case TALK_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[1].x, _hotspotsWalkPos[1].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkChicken; break; @@ -258,7 +257,7 @@ void GnapEngine::scene02_run() { _gnapActionStatus = kASUseTruckNoGas; } } else { - _gnapIdleFacing = 4; + _gnapIdleFacing = kDirUnk4; if (gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1)) _gnapActionStatus = kASUseTruckNoKeys; } @@ -282,7 +281,7 @@ void GnapEngine::scene02_run() { playGnapMoan2(2, 4); break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabTruckGrill; break; diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp index 95449f5e6c..c7600133d2 100644 --- a/engines/gnap/scenes/scene03.cpp +++ b/engines/gnap/scenes/scene03.cpp @@ -91,7 +91,7 @@ void GnapEngine::scene03_run() { _s03_platypusHypnotized = false; - initGnapPos(3, 4, 1); + initGnapPos(3, 4, kDirBottomRight); _gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0); @@ -261,7 +261,7 @@ void GnapEngine::scene03_run() { if (_s03_platypusHypnotized) { playGnapBrainPulsating(8, 4); } else { - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); if (_s03_platypusScared) _gnapActionStatus = kASHypnotizeScaredPlat; @@ -462,7 +462,7 @@ void GnapEngine::scene03_updateAnimations() { _gameSys->insertSequence(_s03_nextPlatSequenceId, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x1B5; _gnapSequenceDatNum = 0; - _gnapIdleFacing = 0; + _gnapIdleFacing = kDirNone; _beaverSequenceId = _s03_nextPlatSequenceId; _beaverSequenceDatNum = 0; _gameSys->setAnimation(_s03_nextPlatSequenceId, 99, 1); @@ -477,7 +477,7 @@ void GnapEngine::scene03_updateAnimations() { _gnapId = 20 * _gnapY; _gnapSequenceId = 0x1B6; _gnapSequenceDatNum = 0; - _gnapIdleFacing = 0; + _gnapIdleFacing = kDirNone; _gnapActionStatus = kASFreePlatypusDone; _s03_nextPlatSequenceId = -1; } else if (_s03_nextPlatSequenceId == 0x1C2 && !_s03_platypusScared) { diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp index 52fdb39d83..164a53f35d 100644 --- a/engines/gnap/scenes/scene04.cpp +++ b/engines/gnap/scenes/scene04.cpp @@ -135,7 +135,7 @@ void GnapEngine::scene04_run() { } else { _gameSys->insertSequence(0x209, 121, 0, 0, kSeqNone, 0, 0, 0); if (_prevSceneNum == 2) { - initGnapPos(5, 11, 7); + initGnapPos(5, 11, kDirUpRight); if (isFlag(0)) initBeaverPos(6, 11, 5); endSceneInit(); @@ -143,11 +143,11 @@ void GnapEngine::scene04_run() { platypusWalkTo(5, 8, -1, 0x107C2, 1); gnapWalkTo(6, 9, -1, 0x107BA, 1); } else if (_prevSceneNum == 38) { - initGnapPos(5, 7, 1); + initGnapPos(5, 7, kDirBottomRight); initBeaverPos(4, 7, 0); endSceneInit(); } else { - initGnapPos(12, 9, 1); + initGnapPos(12, 9, kDirBottomRight); if (isFlag(0)) initBeaverPos(12, 8, 0); endSceneInit(); @@ -242,7 +242,7 @@ void GnapEngine::scene04_run() { playGnapMoan2(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y); break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabAxe; setFlag(26); @@ -270,12 +270,12 @@ void GnapEngine::scene04_run() { } break; case GRAB_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; if (gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _gnapActionStatus = kASGrabDog; break; case TALK_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; if (gnapWalkTo(_gnapX, _gnapY, 0, -1, 1)) { playGnapBrainPulsating(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y); _s04_nextDogSequenceId = 0x20E; @@ -304,7 +304,7 @@ void GnapEngine::scene04_run() { gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, 0x107BC, 1); _gnapActionStatus = kASOpenDoor; _timers[5] = 300; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } else { _isLeavingScene = true; gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, 0x107BC, 1); @@ -485,7 +485,7 @@ void GnapEngine::scene04_updateAnimations() { _gameSys->insertSequence(0x107B5, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), 255, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gnapSequenceId = 0x7B5; _gnapSequenceDatNum = 1; _gnapActionStatus = -1; @@ -514,7 +514,7 @@ void GnapEngine::scene04_updateAnimations() { kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); _gnapSequenceId = 0x7B5; _gnapSequenceDatNum = 1; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gnapActionStatus = -1; break; case kASGrabDog: diff --git a/engines/gnap/scenes/scene05.cpp b/engines/gnap/scenes/scene05.cpp index fea0dc1b63..f13a2a358d 100644 --- a/engines/gnap/scenes/scene05.cpp +++ b/engines/gnap/scenes/scene05.cpp @@ -96,7 +96,7 @@ void GnapEngine::scene05_run() { queueInsertDeviceIcon(); if (_prevSceneNum != 6 && _prevSceneNum != 36) { - initGnapPos(-1, 8, 1); + initGnapPos(-1, 8, kDirBottomRight); if (isFlag(0)) initBeaverPos(-1, 9, 0); endSceneInit(); @@ -104,7 +104,7 @@ void GnapEngine::scene05_run() { platypusWalkTo(2, 8, -1, 0x107C2, 1); gnapWalkTo(2, 9, -1, 0x107B9, 1); } else { - initGnapPos(6, 8, 1); + initGnapPos(6, 8, kDirBottomRight); if (isFlag(0)) initBeaverPos(7, 9, 0); endSceneInit(); @@ -193,7 +193,7 @@ void GnapEngine::scene05_run() { case kHSChicken: if (_gnapActionStatus < 0) { if (_grabCursorSpriteIndex == kItemTwig) { - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y + 1, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASUseTwigWithChicken; @@ -205,12 +205,12 @@ void GnapEngine::scene05_run() { playGnapMoan2(9, 7); break; case GRAB_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[5].x, _hotspotsWalkPos[5].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabChicken; break; case TALK_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[5].x, _hotspotsWalkPos[5].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkChicken; break; @@ -232,7 +232,7 @@ void GnapEngine::scene05_run() { playGnapMoan2(2, 4); break; case GRAB_CURSOR: - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabLadder; break; @@ -267,7 +267,7 @@ void GnapEngine::scene05_run() { playGnapScratchingHead(7, 4); break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTryPickPadlock; diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp index 7df09a1cc0..acf309cbab 100644 --- a/engines/gnap/scenes/scene06.cpp +++ b/engines/gnap/scenes/scene06.cpp @@ -106,7 +106,7 @@ void GnapEngine::scene06_run() { queueInsertDeviceIcon(); - initGnapPos(5, 12, 1); + initGnapPos(5, 12, kDirBottomRight); initBeaverPos(6, 12, 0); endSceneInit(); @@ -228,7 +228,7 @@ void GnapEngine::scene06_run() { _hotspots[kHSWalkArea5]._flags |= SF_WALKABLE; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, 0x107BC, 1); _hotspots[kHSWalkArea5]._flags &= ~SF_WALKABLE; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; platypusWalkTo(6, 8, 1, 0x107C2, 1); _beaverFacing = 0; _gnapActionStatus = kASUseTwigOnHorse; @@ -244,7 +244,7 @@ void GnapEngine::scene06_run() { if (_s06_horseTurnedBack) { gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskBrainPulsating, 3, 2) | 0x10000, 1); } else { - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; _hotspots[kHSWalkArea5]._flags |= SF_WALKABLE; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _hotspots[kHSWalkArea5]._flags &= ~SF_WALKABLE; diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp index c6eda8f3a1..1b609f8689 100644 --- a/engines/gnap/scenes/scene07.cpp +++ b/engines/gnap/scenes/scene07.cpp @@ -71,7 +71,7 @@ void GnapEngine::scene07_run() { _gameSys->insertSequence(0x8D, 1, 0, 0, kSeqNone, 0, 0, 0); if (_prevSceneNum == 8) { - initGnapPos(7, 7, 3); + initGnapPos(7, 7, kDirBottomLeft); initBeaverPos(9, 7, 4); endSceneInit(); } else { @@ -80,7 +80,7 @@ void GnapEngine::scene07_run() { _gnapId = 140; _gnapSequenceId = 0x8F; _gnapSequenceDatNum = 0; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gameSys->insertSequence(0x8F, 140, 0, 0, kSeqNone, 0, 0, 0); _gameSys->setAnimation(makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, 0); _gnapActionStatus = kASWait; diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp index 01e77084b9..5988114f9a 100644 --- a/engines/gnap/scenes/scene08.cpp +++ b/engines/gnap/scenes/scene08.cpp @@ -116,7 +116,7 @@ void GnapEngine::scene08_run() { if (!isFlag(9)) _gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0); - initGnapPos(-1, 8, 1); + initGnapPos(-1, 8, kDirBottomRight); initBeaverPos(-1, 7, 0); endSceneInit(); @@ -202,13 +202,13 @@ void GnapEngine::scene08_run() { gnapActionIdle(0x14D); gnapWalkTo(6, 6, 0, 0x107BB, 1); _gnapActionStatus = kASLookMan; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; break; case GRAB_CURSOR: playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapActionIdle(0x14D); gnapWalkTo(8, 6, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkMan; @@ -240,10 +240,10 @@ void GnapEngine::scene08_run() { case GRAB_CURSOR: gnapWalkTo(4, 7, 0, 0x107BB, 1); _gnapActionStatus = kASGrabDog; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapActionIdle(0x14D); gnapWalkTo(4, 7, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkDog; @@ -515,7 +515,7 @@ void GnapEngine::scene08_updateAnimations() { _timers[3] = getRandom(50) + 200; _gameSys->insertSequence(0x14D, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x14D; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapSequenceDatNum = 0; _gnapActionStatus = -1; } diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp index 69165ce8f0..2cf57a9a12 100644 --- a/engines/gnap/scenes/scene09.cpp +++ b/engines/gnap/scenes/scene09.cpp @@ -67,13 +67,13 @@ void GnapEngine::scene09_run() { _gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0); if (_prevSceneNum == 8) { - initGnapPos(11, 8, 3); + initGnapPos(11, 8, kDirBottomLeft); initBeaverPos(12, 7, 4); endSceneInit(); gnapWalkTo(9, 8, -1, 0x107BA, 1); platypusWalkTo(9, 7, -1, 0x107D2, 1); } else { - initGnapPos(4, 7, 1); + initGnapPos(4, 7, kDirBottomRight); initBeaverPos(5, 7, 0); endSceneInit(); } @@ -221,7 +221,7 @@ void GnapEngine::scene09_updateAnimations() { _gameSys->removeSequence(0x4B, 2, true); _gnapSequenceId = 0x4C; _gnapId = 120; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; _gnapSequenceDatNum = 0; _gnapX = 9; _gnapY = 6; diff --git a/engines/gnap/scenes/scene10.cpp b/engines/gnap/scenes/scene10.cpp index aea4a34789..0a89682c00 100644 --- a/engines/gnap/scenes/scene10.cpp +++ b/engines/gnap/scenes/scene10.cpp @@ -84,13 +84,13 @@ void GnapEngine::scene10_run() { queueInsertDeviceIcon(); if (_prevSceneNum == 9) { - initGnapPos(11, 8, 3); + initGnapPos(11, 8, kDirBottomLeft); initBeaverPos(12, 7, 4); endSceneInit(); gnapWalkTo(9, 8, -1, 0x107BA, 1); platypusWalkTo(9, 7, -1, 0x107D2, 1); } else { - initGnapPos(-1, 7, 1); + initGnapPos(-1, 7, kDirBottomRight); initBeaverPos(-2, 8, 0); endSceneInit(); gnapWalkTo(1, 7, -1, 0x107B9, 1); @@ -173,10 +173,10 @@ void GnapEngine::scene10_run() { break; case GRAB_CURSOR: playGnapImpossible(0, 0); - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapActionIdle(0x10C); gnapWalkTo(4, 8, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASAnnoyCook; @@ -279,7 +279,7 @@ void GnapEngine::scene10_run() { _gameSys->insertSequence(0x10E, 120, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x10E; _gnapId = 120; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapSequenceDatNum = 0; _gnapX = 9; _gnapY = 6; @@ -475,7 +475,7 @@ void GnapEngine::scene10_updateAnimations() { _timers[3] = 300; _gameSys->insertSequence(0x10C, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x10C; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapSequenceDatNum = 0; _gnapActionStatus = -1; _beaverActionStatus = -1; diff --git a/engines/gnap/scenes/scene11.cpp b/engines/gnap/scenes/scene11.cpp index 04509eef5c..f3646772d3 100644 --- a/engines/gnap/scenes/scene11.cpp +++ b/engines/gnap/scenes/scene11.cpp @@ -93,22 +93,22 @@ void GnapEngine::scene11_run() { switch (_prevSceneNum) { case 13: - initGnapPos(8, 5, 3); + initGnapPos(8, 5, kDirBottomLeft); initBeaverPos(9, 6, 4); break; case 47: - initGnapPos(8, 5, 3); + initGnapPos(8, 5, kDirBottomLeft); initBeaverPos(9, 5, 4); _s11_currGoggleGuySequenceId = 0x1FA; _s11_currHookGuySequenceId = 0x1FF; _timers[7] = 180; break; case 12: - initGnapPos(-1, 9, 1); + initGnapPos(-1, 9, kDirBottomRight); initBeaverPos(-2, 8, 0); break; default: - initGnapPos(6, 6, 3); + initGnapPos(6, 6, kDirBottomLeft); initBeaverPos(6, 5, 4); break; } @@ -213,7 +213,7 @@ void GnapEngine::scene11_run() { playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(3, 7, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkGoggleGuy; break; @@ -224,7 +224,7 @@ void GnapEngine::scene11_run() { case kHSHookGuy: if (_gnapActionStatus < 0) { - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; if (_grabCursorSpriteIndex >= 0) { gnapWalkTo(5, 6, 0, 0x107BC, 9); _gnapActionStatus = kASShowItemToHookGuy; @@ -239,7 +239,7 @@ void GnapEngine::scene11_run() { _gnapActionStatus = kASGrabHookGuy; break; case TALK_CURSOR: - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; gnapWalkTo(5, 6, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkHookGuy; break; diff --git a/engines/gnap/scenes/scene12.cpp b/engines/gnap/scenes/scene12.cpp index f26bb30f0b..fae6f83d14 100644 --- a/engines/gnap/scenes/scene12.cpp +++ b/engines/gnap/scenes/scene12.cpp @@ -111,11 +111,11 @@ void GnapEngine::scene12_run() { _timers[7] = getRandom(100) + 100; if (_prevSceneNum == 15) { - initGnapPos(5, 6, 1); + initGnapPos(5, 6, kDirBottomRight); initBeaverPos(3, 7, 0); endSceneInit(); } else { - initGnapPos(11, 8, 3); + initGnapPos(11, 8, kDirBottomLeft); initBeaverPos(12, 8, 4); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); @@ -171,18 +171,18 @@ void GnapEngine::scene12_run() { if (_grabCursorSpriteIndex == kItemQuarter) { _largeSprite = _gameSys->createSurface(0x141); gnapWalkTo(3, 7, 0, 0x107BC, 9); - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; _gnapActionStatus = kASQuarterToToothGuy; playGnapShowItem(_grabCursorSpriteIndex, 2, 0); setGrabCursorSprite(-1); } else if (_grabCursorSpriteIndex == kItemQuarterWithHole) { gnapWalkTo(3, 7, 0, 0x107BC, 9); - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; _gnapActionStatus = kASQuarterWithHoleToToothGuy; playGnapShowItem(_grabCursorSpriteIndex, 2, 0); } else if (_grabCursorSpriteIndex >= 0) { gnapWalkTo(3, 7, 0, 0x107BC, 9); - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; _gnapActionStatus = kASShowItemToToothGuy; playGnapShowItem(_grabCursorSpriteIndex, 2, 0); } else { @@ -195,7 +195,7 @@ void GnapEngine::scene12_run() { _gnapActionStatus = kASGrabToothGuy; break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(3, 7, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkToothGuy; break; @@ -213,26 +213,26 @@ void GnapEngine::scene12_run() { case kHSBarkeeper: if (_grabCursorSpriteIndex == kItemQuarter || _grabCursorSpriteIndex == kItemQuarterWithHole) { gnapWalkTo(6, 6, 0, 0x107BB, 9); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASQuarterWithBarkeeper; playGnapShowItem(_grabCursorSpriteIndex, 7, 0); } else if (_grabCursorSpriteIndex >= 0) { gnapWalkTo(6, 6, 0, 0x107BB, 9); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASShowItemToBarkeeper; playGnapShowItem(_grabCursorSpriteIndex, 7, 0); } else { switch (_verbCursor) { case LOOK_CURSOR: gnapWalkTo(6, 6, 0, 0x107BB, 1); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASLookBarkeeper; break; case GRAB_CURSOR: playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(6, 6, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkBarkeeper; break; @@ -248,24 +248,24 @@ void GnapEngine::scene12_run() { case kHSBeardGuy: if (_grabCursorSpriteIndex >= 0) { gnapWalkTo(7, 6, 0, 0x107BB, 9); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASShowItemToBeardGuy; playGnapShowItem(_grabCursorSpriteIndex, 8, 0); } else { switch (_verbCursor) { case LOOK_CURSOR: gnapWalkTo(7, 6, 0, 0x107BB, 1); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASLookBeardGuy; break; case GRAB_CURSOR: // NOTE Bug in the original. It has 9 as flags which seems wrong here. gnapWalkTo(7, 6, 0, 0x107BB, 1); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASGrabBeardGuy; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(7, 6, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkBeardGuy; break; diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp index 4d7b6d01c6..c1e9bab43e 100644 --- a/engines/gnap/scenes/scene13.cpp +++ b/engines/gnap/scenes/scene13.cpp @@ -107,10 +107,10 @@ void GnapEngine::scene13_run() { _gameSys->insertSequence(0xAA, 256, 0, 0, kSeqNone, 0, 0, 0); if (_prevSceneNum == 14) { - initGnapPos(6, 6, 3); + initGnapPos(6, 6, kDirBottomLeft); initBeaverPos(9, 8, 0); } else { - initGnapPos(3, 7, 1); + initGnapPos(3, 7, kDirBottomRight); initBeaverPos(2, 7, 0); } @@ -190,12 +190,12 @@ void GnapEngine::scene13_run() { 9, 0, 0, 0); _gnapActionStatus = kASWait; _gnapSequenceId = _s13_backToiletCtr + 0xA3; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapSequenceDatNum = 0; } else { gnapWalkTo(5, 5, 0, 0x107BB, 1); _gnapActionStatus = kASBackToilet; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; } break; case PLAT_CURSOR: @@ -216,7 +216,7 @@ void GnapEngine::scene13_run() { case PLAT_CURSOR: gnapWalkTo(6, 7, 0, 0xA9, 5); _gnapActionStatus = kASFrontToilet; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; break; } } @@ -230,13 +230,13 @@ void GnapEngine::scene13_run() { case LOOK_CURSOR: gnapWalkTo(7, 7, 0, 0x107BB, 1); _gnapActionStatus = kASLookScribble; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; break; case GRAB_CURSOR: playGnapScratchingHead(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(7, 7, -1, getGnapSequenceId(gskBrainPulsating, 0, 0), 1); break; case PLAT_CURSOR: @@ -415,7 +415,7 @@ void GnapEngine::scene13_updateAnimations() { _gameSys->removeSequence(0xAA, 256, true); _gnapSequenceId = 0xAB; _gnapId = 160; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gnapSequenceDatNum = 0; _gnapX = 4; _gnapY = 8; @@ -434,7 +434,7 @@ void GnapEngine::scene13_updateAnimations() { _gameSys->insertSequence(0xA2, 120, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0xA2; _gnapId = 120; - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; _gnapSequenceDatNum = 0; _gnapX = 4; _gnapY = 6; diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp index 322cdd62dd..04eb5f3140 100644 --- a/engines/gnap/scenes/scene17.cpp +++ b/engines/gnap/scenes/scene17.cpp @@ -177,13 +177,13 @@ void GnapEngine::scene17_run() { if (_prevSceneNum == 53 || _prevSceneNum == 18 || _prevSceneNum == 20 || _prevSceneNum == 19) { if (_prevSceneNum == 20) { - initGnapPos(4, 6, 1); + initGnapPos(4, 6, kDirBottomRight); initBeaverPos(5, 6, 0); endSceneInit(); platypusWalkTo(5, 9, -1, 0x107C2, 1); gnapWalkTo(4, 8, -1, 0x107B9, 1); } else if (isFlag(27)) { - initGnapPos(3, 9, 5); + initGnapPos(3, 9, kDirUpLeft); _platX = _hotspotsWalkPos[2].x; _platY = _hotspotsWalkPos[2].y; _beaverId = 20 * _hotspotsWalkPos[2].y; @@ -220,7 +220,7 @@ void GnapEngine::scene17_run() { clearFlag(15); clearFlag(16); _sceneWaiting = true; - initGnapPos(3, 9, 5); + initGnapPos(3, 9, kDirUpLeft); _platX = _hotspotsWalkPos[2].x; _platY = _hotspotsWalkPos[2].y; _beaverId = 20 * _hotspotsWalkPos[2].y; @@ -234,18 +234,18 @@ void GnapEngine::scene17_run() { _beaverActionStatus = kASPlatPhoningAssistant; scene17_updateHotspots(); } else if (_prevSceneNum == 18) { - initGnapPos(6, 6, 1); + initGnapPos(6, 6, kDirBottomRight); initBeaverPos(5, 6, 0); endSceneInit(); platypusWalkTo(5, 9, -1, 0x107C2, 1); gnapWalkTo(4, 8, -1, 0x107B9, 1); } else { if (isFlag(15)) { - initGnapPos(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1); + initGnapPos(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, kDirBottomRight); initBeaverPos(1, 9, 0); endSceneInit(); } else { - initGnapPos(3, 7, 1); + initGnapPos(3, 7, kDirBottomRight); initBeaverPos(1, 7, 0); endSceneInit(); } @@ -259,7 +259,7 @@ void GnapEngine::scene17_run() { _gnapId = 120; _gnapSequenceId = 0x23D; _gnapSequenceDatNum = 0; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gameSys->insertSequence(makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, 0, 0, kSeqNone, 0, 0, 0); _platX = -1; _platY = 8; @@ -417,7 +417,7 @@ void GnapEngine::scene17_run() { if (isFlag(18)) { scene17_platHangUpPhone(); _isLeavingScene = true; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGnapUsePhone; setFlag(15); @@ -449,7 +449,7 @@ void GnapEngine::scene17_run() { if (_gnapActionStatus < 0) { _isLeavingScene = true; _newSceneNum = 18; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[5].x, _hotspotsWalkPos[5].y, 0, 0x107BB, 1); _gnapActionStatus = kASLeaveScene; if (_beaverActionStatus != kASPlatPhoningAssistant) @@ -462,7 +462,7 @@ void GnapEngine::scene17_run() { scene17_platHangUpPhone(); _isLeavingScene = true; _newSceneNum = 20; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[3].x, _hotspotsWalkPos[3].y, 0, 0x107BC, 1); _gnapActionStatus = kASLeaveScene; platypusWalkTo(_hotspotsWalkPos[3].x + 1, _hotspotsWalkPos[3].y, -1, 0x107C2, 1); diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp index 5466360c11..53a89e019a 100644 --- a/engines/gnap/scenes/scene18.cpp +++ b/engines/gnap/scenes/scene18.cpp @@ -210,9 +210,9 @@ void GnapEngine::scene18_gnapCarryGarbageCanTo(int x, int y, int animationIndex, } if (direction == 1) - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; else - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; _gnapId = 20 * _gnapY + 1; @@ -233,13 +233,13 @@ void GnapEngine::scene18_putDownGarbageCan(int animationIndex) { while (_gameSys->getAnimationStatus(animationIndex) != 2) gameUpdateTick(); } - if (_gnapIdleFacing != 0 && _gnapIdleFacing != 1 && _gnapIdleFacing != 7) + if (_gnapIdleFacing != kDirNone && _gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) _s18_garbageCanPos = _gnapX - 1; else _s18_garbageCanPos = _gnapX + 1; clearFlag(10); scene18_updateHotspots(); - if (_gnapIdleFacing != 0 && _gnapIdleFacing != 1 && _gnapIdleFacing != 7) { + if (_gnapIdleFacing != kDirNone && _gnapIdleFacing != kDirBottomRight && _gnapIdleFacing != kDirUpRight) { _gameSys->insertSequence(0x107BA, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY); @@ -348,9 +348,9 @@ void GnapEngine::scene18_run() { if (isFlag(26)) { if (_prevSceneNum == 17) - initGnapPos(4, 11, 1); + initGnapPos(4, 11, kDirBottomRight); else - initGnapPos(4, 7, 1); + initGnapPos(4, 7, kDirBottomRight); _s18_platPhoneCtr = getRandom(5); if (isFlag(27)) { _gameSys->insertSequence(0x21E, 254, 0, 0, kSeqNone, 0, 0, 0); @@ -379,19 +379,19 @@ void GnapEngine::scene18_run() { _prevSceneNum = 19; } if (_prevSceneNum == 17) { - initGnapPos(4, 11, 1); + initGnapPos(4, 11, kDirBottomRight); initBeaverPos(5, 11, 0); endSceneInit(); gnapWalkTo(4, 8, -1, 0x107B9, 1); platypusWalkTo(5, 9, -1, 0x107C2, 1); } else if (_prevSceneNum == 19) { - initGnapPos(7, 7, 1); + initGnapPos(7, 7, kDirBottomRight); initBeaverPos(8, 7, 0); endSceneInit(); gnapWalkTo(7, 8, -1, 0x107B9, 1); platypusWalkTo(8, 8, -1, 0x107C2, 1); } else { - initGnapPos(-1, 10, 1); + initGnapPos(-1, 10, kDirBottomRight); initBeaverPos(-1, 10, 0); endSceneInit(); gnapWalkTo(3, 7, -1, 0x107B9, 1); @@ -785,7 +785,7 @@ void GnapEngine::scene18_updateAnimations() { _gameSys->setAnimation(0, 0, 0); switch (_gnapActionStatus) { case kASGrabGarbageCanFromStreet: - if (_gnapIdleFacing != 7 && _gnapIdleFacing != 1) { + if (_gnapIdleFacing != kDirUpRight && _gnapIdleFacing != kDirBottomRight) { _gameSys->insertSequence(0x1FC, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 75 * _gnapX - 675, 0); diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp index 60208bc381..2f588f2995 100644 --- a/engines/gnap/scenes/scene19.cpp +++ b/engines/gnap/scenes/scene19.cpp @@ -110,7 +110,7 @@ void GnapEngine::scene19_run() { _gameSys->insertSequence(0x69, 19, 0, 0, kSeqNone, 0, 0, 0); if (isFlag(26)) { - initGnapPos(3, 6, 1); + initGnapPos(3, 6, kDirBottomRight); _s19_currShopAssistantSequenceId = kS19ShopAssistantSequenceIds[getRandom(5)]; _s19_nextShopAssistantSequenceId = _s19_currShopAssistantSequenceId; _gameSys->setAnimation(_s19_currShopAssistantSequenceId, 20, 4); @@ -126,7 +126,7 @@ void GnapEngine::scene19_run() { _gameSys->setAnimation(0x6D, 20, 4); _gameSys->insertSequence(_s19_currShopAssistantSequenceId, 20, 0, 0, kSeqNone, 0, 0, 0); _timers[6] = getRandom(40) + 50; - initGnapPos(3, 6, 1); + initGnapPos(3, 6, kDirBottomRight); initBeaverPos(4, 6, 0); endSceneInit(); gnapWalkTo(4, 9, -1, 0x107B9, 1); @@ -227,7 +227,7 @@ void GnapEngine::scene19_run() { playGnapScratchingHead(6, 2); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkShopAssistant; break; diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp index 788a7fac0b..990ceca499 100644 --- a/engines/gnap/scenes/scene20.cpp +++ b/engines/gnap/scenes/scene20.cpp @@ -228,42 +228,42 @@ void GnapEngine::scene20_run() { // checkGameAppStatus(); gameUpdateTick(); } - initGnapPos(11, 8, 3); + initGnapPos(11, 8, kDirBottomLeft); initBeaverPos(11, 9, 4); gnapWalkTo(5, 8, -1, 0x107BA, 1); platypusWalkTo(6, 9, -1, 0x107C2, 1); } else { switch (_prevSceneNum) { case 17: - initGnapPos(5, 11, 1); + initGnapPos(5, 11, kDirBottomRight); initBeaverPos(6, 11, 0); endSceneInit(); gnapWalkTo(5, 8, -1, 0x107B9, 1); platypusWalkTo(6, 9, -1, 0x107C2, 1); break; case 18: - initGnapPos(11, 8, 3); + initGnapPos(11, 8, kDirBottomLeft); initBeaverPos(11, 9, 4); endSceneInit(); gnapWalkTo(5, 8, -1, 0x107BA, 1); platypusWalkTo(6, 9, -1, 0x107C2, 1); break; case 21: - initGnapPos(-1, 8, 3); + initGnapPos(-1, 8, kDirBottomLeft); initBeaverPos(-1, 9, 4); endSceneInit(); gnapWalkTo(3, 8, -1, 0x107B9, 1); platypusWalkTo(3, 9, -1, 0x107C2, 1); break; case 22: - initGnapPos(7, 6, 1); + initGnapPos(7, 6, kDirBottomRight); initBeaverPos(8, 6, 0); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107B9, 1); platypusWalkTo(9, 9, -1, 0x107C2, 1); break; default: - initGnapPos(8, 6, 3); + initGnapPos(8, 6, kDirBottomLeft); initBeaverPos(9, 6, 4); endSceneInit(); _hotspots[kHSWalkArea2]._flags |= SF_WALKABLE; @@ -394,7 +394,7 @@ void GnapEngine::scene20_run() { playGnapMoan2(5, 4); break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSStonerGuy].x, _hotspotsWalkPos[kHSStonerGuy].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); if (_s20_stonerGuyShowingJoint) _gnapActionStatus = kASGrabJoint; @@ -402,7 +402,7 @@ void GnapEngine::scene20_run() { playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSStonerGuy].x, _hotspotsWalkPos[kHSStonerGuy].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); if (isFlag(17)) _gnapActionStatus = kASTalkStonerGuyNoJoint; @@ -428,12 +428,12 @@ void GnapEngine::scene20_run() { break; case GRAB_CURSOR: _s20_stonerGuyShowingJoint = false; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSGroceryStoreGuy].x, _hotspotsWalkPos[kHSGroceryStoreGuy].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabGroceryStoreGuy; break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSGroceryStoreGuy].x, _hotspotsWalkPos[kHSGroceryStoreGuy].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkGroceryStoreGuy; break; @@ -448,7 +448,7 @@ void GnapEngine::scene20_run() { case kHSGroceryStoreHat: if (_gnapActionStatus < 0) { if (_grabCursorSpriteIndex == kItemCowboyHat) { - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSGroceryStoreHat].x, _hotspotsWalkPos[kHSGroceryStoreHat].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASSwitchGroceryStoreHat; } else if (_grabCursorSpriteIndex >= 0) { @@ -460,7 +460,7 @@ void GnapEngine::scene20_run() { break; case GRAB_CURSOR: _s20_stonerGuyShowingJoint = false; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSGroceryStoreGuy].x, _hotspotsWalkPos[kHSGroceryStoreGuy].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabGroceryStoreHat; break; @@ -650,7 +650,7 @@ void GnapEngine::scene20_updateAnimations() { removeFullScreenSprite(); showCursor(); setGrabCursorSprite(kItemGroceryStoreHat); - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(3, 8, -1, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = -1; break; diff --git a/engines/gnap/scenes/scene21.cpp b/engines/gnap/scenes/scene21.cpp index 6f1f406ad2..415c82f893 100644 --- a/engines/gnap/scenes/scene21.cpp +++ b/engines/gnap/scenes/scene21.cpp @@ -77,7 +77,7 @@ void GnapEngine::scene21_run() { if (isFlag(3)) { if (isFlag(5)) { - initGnapPos(5, 8, 1); + initGnapPos(5, 8, kDirBottomRight); initBeaverPos(6, 8, 0); _gameSys->insertSequence(0x8E, 2, 0, 0, kSeqNone, 0, 0, 0); if (!isFlag(4)) @@ -85,7 +85,7 @@ void GnapEngine::scene21_run() { endSceneInit(); clearFlag(5); } else { - initGnapPos(5, 11, 1); + initGnapPos(5, 11, kDirBottomRight); initBeaverPos(6, 11, 0); if (!isFlag(4)) _gameSys->insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0); @@ -94,7 +94,7 @@ void GnapEngine::scene21_run() { platypusWalkTo(6, 8, -1, 0x107C2, 1); } } else { - initGnapPos(5, 11, 1); + initGnapPos(5, 11, kDirBottomRight); initBeaverPos(6, 11, 0); _s21_currOldLadySequenceId = 0x89; _gameSys->setAnimation(0x89, 79, 3); @@ -186,14 +186,14 @@ void GnapEngine::scene21_run() { playGnapScratchingHead(7, 4); break; case GRAB_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; _hotspots[kHSWalkArea1]._flags |= SF_WALKABLE; gnapWalkTo(7, 6, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASGrabOldLady; _hotspots[kHSWalkArea1]._flags &= ~SF_WALKABLE; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSOldLady].x, _hotspotsWalkPos[kHSOldLady].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkOldLady; break; diff --git a/engines/gnap/scenes/scene22.cpp b/engines/gnap/scenes/scene22.cpp index 65b7bc618d..c0e6d2b14f 100644 --- a/engines/gnap/scenes/scene22.cpp +++ b/engines/gnap/scenes/scene22.cpp @@ -71,11 +71,11 @@ void GnapEngine::scene22_run() { queueInsertDeviceIcon(); if (_prevSceneNum == 20) { - initGnapPos(2, 8, 1); + initGnapPos(2, 8, kDirBottomRight); initBeaverPos(1, 8, 0); endSceneInit(); } else { - initGnapPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y, 1); + initGnapPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y, kDirBottomRight); initBeaverPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y + 1, 0); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107B9, 1); @@ -193,7 +193,7 @@ void GnapEngine::scene22_run() { playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSCashier].x, _hotspotsWalkPos[kHSCashier].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkCashier; diff --git a/engines/gnap/scenes/scene23.cpp b/engines/gnap/scenes/scene23.cpp index 7257ab1753..62a3c8bcbf 100644 --- a/engines/gnap/scenes/scene23.cpp +++ b/engines/gnap/scenes/scene23.cpp @@ -69,7 +69,7 @@ void GnapEngine::scene23_run() { queueInsertDeviceIcon(); - initGnapPos(-1, 7, 1); + initGnapPos(-1, 7, kDirBottomRight); initBeaverPos(-2, 7, 0); _gameSys->insertSequence(0xBD, 255, 0, 0, kSeqNone, 0, 0, 0); _gameSys->insertSequence(0xBF, 2, 0, 0, kSeqNone, 0, 0, 0); @@ -151,7 +151,7 @@ void GnapEngine::scene23_run() { if (isFlag(11)) playGnapImpossible(0, 0); else { - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[kHSCereals].x, _hotspotsWalkPos[kHSCereals].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); setFlag(11); diff --git a/engines/gnap/scenes/scene24.cpp b/engines/gnap/scenes/scene24.cpp index b7660a3723..7546b45ab6 100644 --- a/engines/gnap/scenes/scene24.cpp +++ b/engines/gnap/scenes/scene24.cpp @@ -84,13 +84,13 @@ void GnapEngine::scene24_run() { queueInsertDeviceIcon(); if (_prevSceneNum == 20) { - initGnapPos(1, 8, 1); + initGnapPos(1, 8, kDirBottomRight); initBeaverPos(2, 8, 0); endSceneInit(); gnapWalkTo(1, 9, -1, 0x107B9, 1); platypusWalkTo(2, 9, -1, 0x107C2, 1); } else { - initGnapPos(8, 8, 3); + initGnapPos(8, 8, kDirBottomLeft); initBeaverPos(8, 8, 4); endSceneInit(); gnapWalkTo(2, 8, -1, 0x107BA, 1); @@ -156,7 +156,7 @@ void GnapEngine::scene24_run() { if (_gnapActionStatus < 0) { _isLeavingScene = true; _newSceneNum = 20; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSExitOutsideGrubCity].x, _hotspotsWalkPos[kHSExitOutsideGrubCity].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASLeaveScene; platypusWalkTo(_hotspotsWalkPos[kHSExitOutsideGrubCity].x + 1, _hotspotsWalkPos[kHSExitOutsideGrubCity].y, -1, 0x107C2, 1); diff --git a/engines/gnap/scenes/scene25.cpp b/engines/gnap/scenes/scene25.cpp index b1bbfb40e8..5a6d7d325a 100644 --- a/engines/gnap/scenes/scene25.cpp +++ b/engines/gnap/scenes/scene25.cpp @@ -121,13 +121,13 @@ void GnapEngine::scene25_run() { queueInsertDeviceIcon(); if (_prevSceneNum == 24) { - initGnapPos(5, 11, 5); + initGnapPos(5, 11, kDirUpLeft); initBeaverPos(6, 11, 4); endSceneInit(); gnapWalkTo(5, 7, -1, 0x107BA, 1); platypusWalkTo(6, 7, -1, 0x107C2, 1); } else { - initGnapPos(5, 6, 1); + initGnapPos(5, 6, kDirBottomRight); initBeaverPos(6, 6, 0); endSceneInit(); gnapWalkTo(5, 8, -1, 0x107B9, 1); @@ -195,7 +195,7 @@ void GnapEngine::scene25_run() { _s25_nextTicketVendorSequenceId = (getRandom(2) == 1) ? 0x59 : 0x56; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSTicketVendor].x, _hotspotsWalkPos[kHSTicketVendor].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkTicketVendor; break; @@ -249,11 +249,11 @@ void GnapEngine::scene25_run() { case LOOK_CURSOR: gnapWalkTo(_hotspotsWalkPos[_sceneClickedHotspot].x, _hotspotsWalkPos[_sceneClickedHotspot].y, -1, -1, 1); if (_sceneClickedHotspot == 5 || _sceneClickedHotspot == 6) - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; else if (_sceneClickedHotspot == 8) - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; else - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; playGnapIdle(0, 0); scene25_playAnims(8 - _sceneClickedHotspot + 1); break; diff --git a/engines/gnap/scenes/scene26.cpp b/engines/gnap/scenes/scene26.cpp index 974525d55a..bef046c2bc 100644 --- a/engines/gnap/scenes/scene26.cpp +++ b/engines/gnap/scenes/scene26.cpp @@ -81,13 +81,13 @@ void GnapEngine::scene26_run() { _gameSys->insertSequence(0x5E, 40, 0, 0, kSeqLoop, 0, 0, 0); if (_prevSceneNum == 25) { - initGnapPos(-1, 8, 1); + initGnapPos(-1, 8, kDirBottomRight); initBeaverPos(-2, 8, 0); endSceneInit(); gnapWalkTo(2, 8, -1, 0x107B9, 1); platypusWalkTo(1, 8, -1, 0x107C2, 1); } else { - initGnapPos(2, 8, 1); + initGnapPos(2, 8, kDirBottomRight); initBeaverPos(3, 8, 0); endSceneInit(); } diff --git a/engines/gnap/scenes/scene27.cpp b/engines/gnap/scenes/scene27.cpp index d241daf04d..e36098113c 100644 --- a/engines/gnap/scenes/scene27.cpp +++ b/engines/gnap/scenes/scene27.cpp @@ -92,28 +92,28 @@ void GnapEngine::scene27_run() { switch (_prevSceneNum) { case 26: - initGnapPos(7, 12, 1); + initGnapPos(7, 12, kDirBottomRight); initBeaverPos(6, 12, 0); endSceneInit(); gnapWalkTo(7, 8, -1, 0x107B9, 1); platypusWalkTo(6, 8, -1, 0x107C2, 1); break; case 29: - initGnapPos(-1, 8, 1); + initGnapPos(-1, 8, kDirBottomRight); initBeaverPos(-1, 9, 0); endSceneInit(); gnapWalkTo(3, 8, -1, 0x107B9, 1); platypusWalkTo(3, 9, -1, 0x107C2, 1); break; case 31: - initGnapPos(12, 8, 3); + initGnapPos(12, 8, kDirBottomLeft); initBeaverPos(12, 9, 4); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); platypusWalkTo(8, 9, -1, 0x107C2, 1); break; default: - initGnapPos(6, 8, 1); + initGnapPos(6, 8, kDirBottomRight); initBeaverPos(5, 9, 0); endSceneInit(); break; @@ -166,7 +166,7 @@ void GnapEngine::scene27_run() { case kHSJanitor: if (_gnapActionStatus < 0) { if (_grabCursorSpriteIndex == kItemPicture) { - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; if (gnapWalkTo(_hotspotsWalkPos[kHSJanitor].x, _hotspotsWalkPos[kHSJanitor].y, 0, 0x107BC, 1)) _gnapActionStatus = kASShowPictureToJanitor; } else if (_grabCursorSpriteIndex >= 0) { @@ -177,7 +177,7 @@ void GnapEngine::scene27_run() { playGnapScratchingHead(6, 3); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSJanitor].x, _hotspotsWalkPos[kHSJanitor].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkJanitor; break; @@ -200,7 +200,7 @@ void GnapEngine::scene27_run() { playGnapScratchingHead(3, 3); break; case GRAB_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_gnapX, _gnapY, 0, getGnapSequenceId(gskIdle, _hotspotsWalkPos[kHSBucket].x, _hotspotsWalkPos[kHSBucket].y) | 0x10000, 1); _gnapActionStatus = kASGrabBucket; break; diff --git a/engines/gnap/scenes/scene28.cpp b/engines/gnap/scenes/scene28.cpp index e39bb8d92d..0d04e2ed0b 100644 --- a/engines/gnap/scenes/scene28.cpp +++ b/engines/gnap/scenes/scene28.cpp @@ -94,12 +94,12 @@ void GnapEngine::scene28_run() { _gameSys->insertSequence(_s28_currClownSequenceId, 39, 0, 0, kSeqNone, 0, 0, 0); _timers[4] = getRandom(20) + 80; } - initGnapPos(8, 8, 3); + initGnapPos(8, 8, kDirBottomLeft); initBeaverPos(9, 8, 4); endSceneInit(); } else { _gameSys->insertSequence(0x11B, 39, 0, 0, kSeqNone, 0, 0, 0); - initGnapPos(8, 8, 3); + initGnapPos(8, 8, kDirBottomLeft); initBeaverPos(9, 8, 4); endSceneInit(); playSequences(0xF7, 0x121, 0x122, 0x123); @@ -176,7 +176,7 @@ void GnapEngine::scene28_run() { _gnapActionStatus = kASGrabHornSuccess; } } else { - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(2, 8, 0, 0x107BB, 1); _hotspots[kHSWalkArea1]._flags |= SF_WALKABLE; gnapWalkTo(_hotspotsWalkPos[kHSHorn].x, _hotspotsWalkPos[kHSHorn].y, 0, 0x107BB, 1); @@ -201,13 +201,13 @@ void GnapEngine::scene28_run() { else playGnapImpossible(0, 0); } else if (_grabCursorSpriteIndex == kItemBucketWithBeer) { - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSClown].x, _hotspotsWalkPos[kHSClown].y, 0, 0x107BC, 1); playGnapPullOutDevice(0, 0); playGnapUseDevice(0, 0); _gnapActionStatus = kASUseBeerBucketWithClown; } else if (_grabCursorSpriteIndex == kItemBucketWithPill) { - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSClown].x, _hotspotsWalkPos[kHSClown].y, 0, 0x107BC, 1); playGnapPullOutDevice(0, 0); playGnapUseDevice(0, 0); @@ -220,7 +220,7 @@ void GnapEngine::scene28_run() { playGnapScratchingHead(5, 2); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(5, 8, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkClown; break; diff --git a/engines/gnap/scenes/scene29.cpp b/engines/gnap/scenes/scene29.cpp index 666ec9e845..98215d4728 100644 --- a/engines/gnap/scenes/scene29.cpp +++ b/engines/gnap/scenes/scene29.cpp @@ -85,13 +85,13 @@ void GnapEngine::scene29_run() { _gameSys->insertSequence(0xF5, 38, 0, 0, kSeqLoop, 0, 0, 0); if (_prevSceneNum == 27) { - initGnapPos(12, 7, 1); + initGnapPos(12, 7, kDirBottomRight); initBeaverPos(12, 8, 0); endSceneInit(); gnapWalkTo(8, 7, -1, 0x107B9, 1); platypusWalkTo(8, 8, -1, 0x107C2, 1); } else { - initGnapPos(-1, 7, 1); + initGnapPos(-1, 7, kDirBottomRight); initBeaverPos(-2, 7, 0); endSceneInit(); gnapWalkTo(2, 7, -1, 0x107B9, 1); @@ -144,7 +144,7 @@ void GnapEngine::scene29_run() { case kHSMonkey: if (_gnapActionStatus < 0) { if (_grabCursorSpriteIndex == kItemBanana) { - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[kHSMonkey].x, _hotspotsWalkPos[kHSMonkey].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1); _gnapActionStatus = kASUseBananaWithMonkey; _newSceneNum = 51; diff --git a/engines/gnap/scenes/scene30.cpp b/engines/gnap/scenes/scene30.cpp index 48b97bdaae..9a641739b2 100644 --- a/engines/gnap/scenes/scene30.cpp +++ b/engines/gnap/scenes/scene30.cpp @@ -75,7 +75,7 @@ void GnapEngine::scene30_run() { _timers[4] = getRandom(100) + 300; _s30_kidSequenceId = 0x101; - initGnapPos(7, 12, 1); + initGnapPos(7, 12, kDirBottomRight); initBeaverPos(6, 12, 0); endSceneInit(); gnapWalkTo(7, 8, -1, 0x107B9, 1); diff --git a/engines/gnap/scenes/scene31.cpp b/engines/gnap/scenes/scene31.cpp index 17cde86db4..b39b61bcdb 100644 --- a/engines/gnap/scenes/scene31.cpp +++ b/engines/gnap/scenes/scene31.cpp @@ -79,13 +79,13 @@ void GnapEngine::scene31_run() { _timers[5] = getRandom(50) + 180; if (_prevSceneNum == 27) { - initGnapPos(-1, 8, 3); + initGnapPos(-1, 8, kDirBottomLeft); initBeaverPos(-1, 9, 4); endSceneInit(); gnapWalkTo(3, 8, -1, 0x107BA, 1); platypusWalkTo(3, 9, -1, 0x107D2, 1); } else { - initGnapPos(7, 12, 1); + initGnapPos(7, 12, kDirBottomRight); initBeaverPos(6, 12, 0); endSceneInit(); gnapWalkTo(7, 8, -1, 0x107BA, 1); @@ -203,7 +203,7 @@ void GnapEngine::scene31_run() { } else { gnapWalkTo(_hotspotsWalkPos[kHSBeerBarrel].x, _hotspotsWalkPos[kHSBeerBarrel].y, 0, 0x107BC, 1); _gnapActionStatus = kASUseBeerBarrel; - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; } break; case TALK_CURSOR: @@ -322,7 +322,7 @@ void GnapEngine::scene31_updateAnimations() { _gnapActionStatus = kASFillEmptyBucketWithBeerDone; break; case kASFillEmptyBucketWithBeerDone: - _gnapIdleFacing = 3; + _gnapIdleFacing = kDirBottomLeft; playGnapPullOutDevice(0, 0); playGnapUseDevice(0, 0); _gameSys->insertSequence(0xF9, 59, 0xF8, 59, kSeqSyncWait, 0, 0, 0); diff --git a/engines/gnap/scenes/scene32.cpp b/engines/gnap/scenes/scene32.cpp index fca05ee7b4..b91e1be7ad 100644 --- a/engines/gnap/scenes/scene32.cpp +++ b/engines/gnap/scenes/scene32.cpp @@ -72,13 +72,13 @@ void GnapEngine::scene32_run() { _timers[4] = getRandom(100) + 300; if (_prevSceneNum == 33) { - initGnapPos(11, 6, 3); + initGnapPos(11, 6, kDirBottomLeft); initBeaverPos(12, 6, 4); endSceneInit(); platypusWalkTo(9, 6, -1, 0x107D2, 1); gnapWalkTo(8, 6, -1, 0x107BA, 1); } else { - initGnapPos(1, 6, 1); + initGnapPos(1, 6, kDirBottomRight); initBeaverPos(1, 7, 0); endSceneInit(); } diff --git a/engines/gnap/scenes/scene33.cpp b/engines/gnap/scenes/scene33.cpp index b601d5fab1..ed56b68613 100644 --- a/engines/gnap/scenes/scene33.cpp +++ b/engines/gnap/scenes/scene33.cpp @@ -77,26 +77,26 @@ void GnapEngine::scene33_run() { switch (_prevSceneNum) { case 34: - initGnapPos(11, 7, 3); + initGnapPos(11, 7, kDirBottomLeft); initBeaverPos(12, 7, 4); endSceneInit(); gnapWalkTo(8, 7, -1, 0x107BA, 1); platypusWalkTo(9, 7, -1, 0x107D2, 1); break; case 37: - initGnapPos(7, 7, 1); + initGnapPos(7, 7, kDirBottomRight); initBeaverPos(8, 7, 0); endSceneInit(); break; case 32: - initGnapPos(-1, 6, 1); + initGnapPos(-1, 6, kDirBottomRight); initBeaverPos(-1, 7, 0); endSceneInit(); platypusWalkTo(2, 7, -1, 0x107C2, 1); gnapWalkTo(2, 8, -1, 0x107B9, 1); break; default: - initGnapPos(3, 7, 1); + initGnapPos(3, 7, kDirBottomRight); initBeaverPos(2, 7, 0); endSceneInit(); break; @@ -151,14 +151,14 @@ void GnapEngine::scene33_run() { } else { switch (_verbCursor) { case GRAB_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; if (gnapWalkTo(_hotspotsWalkPos[kHSChicken].x, _hotspotsWalkPos[kHSChicken].y, 0, getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _gnapActionStatus = kASUseChicken; else _gnapActionStatus = -1; break; case TALK_CURSOR: - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; gnapWalkTo(_hotspotsWalkPos[kHSChicken].x, _hotspotsWalkPos[kHSChicken].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkChicken; break; diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp index a53d5b0691..f5351fe2c5 100644 --- a/engines/gnap/scenes/scene38.cpp +++ b/engines/gnap/scenes/scene38.cpp @@ -97,10 +97,10 @@ void GnapEngine::scene38_run() { _gameSys->insertSequence(0x9B, 0, 0, 0, kSeqNone, 0, 0, 0); if (_prevSceneNum == 39) { - initGnapPos(3, 7, 3); + initGnapPos(3, 7, kDirBottomLeft); initBeaverPos(4, 7, 4); } else { - initGnapPos(3, 8, 1); + initGnapPos(3, 8, kDirBottomRight); initBeaverPos(4, 8, 0); } endSceneInit(); @@ -304,7 +304,7 @@ void GnapEngine::scene38_updateAnimations() { _gnapSequenceDatNum = 0; _gnapX = 3; _gnapY = 6; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; if (_isLeavingScene) { _sceneWaiting = false; gnapWalkTo(5, 7, 0, 0x107BB, 1); @@ -319,7 +319,7 @@ void GnapEngine::scene38_updateAnimations() { _gnapSequenceDatNum = 0; _gnapX = 3; _gnapY = 6; - _gnapIdleFacing = 1; + _gnapIdleFacing = kDirBottomRight; _gameSys->setAnimation(0x9E, _gnapId, 0); _sceneWaiting = false; scene38_updateHotspots(); diff --git a/engines/gnap/scenes/scene39.cpp b/engines/gnap/scenes/scene39.cpp index b8a5f1e724..94bdcb5a0e 100644 --- a/engines/gnap/scenes/scene39.cpp +++ b/engines/gnap/scenes/scene39.cpp @@ -70,11 +70,11 @@ void GnapEngine::scene39_run() { _s39_nextGuySequenceId = -1; if (_prevSceneNum == 38) { - initGnapPos(3, 7, 7); + initGnapPos(3, 7, kDirUpRight); initBeaverPos(2, 7, 5); endSceneInit(); } else { - initGnapPos(4, 7, 1); + initGnapPos(4, 7, kDirBottomRight); initBeaverPos(5, 7, 0); endSceneInit(); } diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp index ca5c677264..ab49458cb4 100644 --- a/engines/gnap/scenes/scene41.cpp +++ b/engines/gnap/scenes/scene41.cpp @@ -133,7 +133,7 @@ void GnapEngine::scene41_run() { if (isFlag(12)) { _gnapSequenceId = 0x120; _gnapSequenceDatNum = 0; - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapX = 7; _gnapY = 7; _gnapId = 140; @@ -142,19 +142,19 @@ void GnapEngine::scene41_run() { initBeaverPos(8, 10, 3); endSceneInit(); } else if (_prevSceneNum == 45) { - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-2, 8, 5); endSceneInit(); platypusWalkTo(1, 8, -1, 0x107C2, 1); gnapWalkTo(2, 8, -1, 0x107B9, 1); } else if (_prevSceneNum == 42) { - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(11, 9, 5); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { - initGnapPos(5, 8, 1); + initGnapPos(5, 8, kDirBottomRight); initBeaverPos(6, 8, 3); endSceneInit(); } @@ -287,7 +287,7 @@ void GnapEngine::scene41_run() { playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(4, 7, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkToyVendor; break; @@ -301,7 +301,7 @@ void GnapEngine::scene41_run() { case kHSKid: if (_grabCursorSpriteIndex == kItemChickenBucket) { gnapWalkTo(7, 7, 0, 0x107BB, 1); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASUseChickenBucketWithKid; } else if (_grabCursorSpriteIndex >= 0) { playGnapShowCurrItem(7, 7, 8, 0); @@ -312,11 +312,11 @@ void GnapEngine::scene41_run() { break; case GRAB_CURSOR: gnapWalkTo(7, 7, 0, 0x107BB, 1); - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; _gnapActionStatus = kASGrabKid; break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(7, 7, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); break; case PLAT_CURSOR: diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp index 3826f7b29b..4ebcec6650 100644 --- a/engines/gnap/scenes/scene42.cpp +++ b/engines/gnap/scenes/scene42.cpp @@ -125,19 +125,19 @@ void GnapEngine::scene42_run() { if (_toyUfoSequenceId == 0x872) setGrabCursorSprite(-1); } else if (_prevSceneNum == 41) { - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-1, 9, 5); endSceneInit(); gnapWalkTo(2, 8, -1, 0x107B9, 1); platypusWalkTo(1, 8, -1, 0x107C2, 1); } else if (_prevSceneNum == 43) { - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(11, 9, 5); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { - initGnapPos(5, 11, 7); + initGnapPos(5, 11, kDirUpRight); initBeaverPos(6, 11, 5); endSceneInit(); gnapWalkTo(5, 8, -1, 0x107BA, 1); @@ -266,7 +266,7 @@ void GnapEngine::scene42_run() { playGnapScratchingHead(_hotspotsWalkPos[kHSBBQVendor].x - 1, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSBBQVendor].x, _hotspotsWalkPos[kHSBBQVendor].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = kASTalkBBQVendor; break; diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp index 957aea3ec6..2484a62227 100644 --- a/engines/gnap/scenes/scene43.cpp +++ b/engines/gnap/scenes/scene43.cpp @@ -113,27 +113,27 @@ void GnapEngine::scene43_run() { } else { switch (_prevSceneNum) { case 42: - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-1, 9, 5); endSceneInit(); gnapWalkTo(2, 8, -1, 0x107B9, 1); platypusWalkTo(1, 8, -1, 0x107C2, 1); break; case 44: - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(11, 9, 5); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); platypusWalkTo(9, 8, -1, 0x107D2, 1); break; case 54: - initGnapPos(4, 7, 3); + initGnapPos(4, 7, kDirBottomLeft); initBeaverPos(11, 8, 5); endSceneInit(); platypusWalkTo(9, 8, -1, 0x107D2, 1); break; default: - initGnapPos(5, 11, 7); + initGnapPos(5, 11, kDirUpRight); initBeaverPos(6, 11, 5); endSceneInit(); gnapWalkTo(5, 8, -1, 0x107BA, 1); @@ -267,7 +267,7 @@ void GnapEngine::scene43_run() { playGnapScratchingHead(7, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(5, 8, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = 2; break; @@ -289,7 +289,7 @@ void GnapEngine::scene43_run() { playGnapScratchingHead(0, 0); break; case GRAB_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(3, 7, 0, 67515, 1); _gnapActionStatus = 1; break; diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp index 3bcde76fc6..af961ad469 100644 --- a/engines/gnap/scenes/scene44.cpp +++ b/engines/gnap/scenes/scene44.cpp @@ -127,21 +127,21 @@ void GnapEngine::scene44_run() { } else { switch (_prevSceneNum) { case 43: - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-1, 7, 5); endSceneInit(); gnapWalkTo(2, 8, -1, 0x107B9, 1); platypusWalkTo(1, 8, -1, 0x107C2, 1); break; case 46: - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(11, 8, 5); endSceneInit(); gnapWalkTo(6, 8, -1, 0x107BA, 1); platypusWalkTo(7, 8, -1, 0x107D2, 1); break; case 50: - initGnapPos(4, 8, 1); + initGnapPos(4, 8, kDirBottomRight); if (_sceneSavegameLoaded) { initBeaverPos(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 4); } else if (!isFlag(13)) { @@ -158,7 +158,7 @@ void GnapEngine::scene44_run() { endSceneInit(); break; default: - initGnapPos(5, 11, 7); + initGnapPos(5, 11, kDirUpRight); initBeaverPos(6, 11, 5); endSceneInit(); platypusWalkTo(6, 8, -1, 0x107C2, 1); @@ -279,7 +279,7 @@ void GnapEngine::scene44_run() { playGnapImpossible(0, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSKissingLady].x, _hotspotsWalkPos[kHSKissingLady].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = 1; break; @@ -333,7 +333,7 @@ void GnapEngine::scene44_run() { playGnapScratchingHead(8, 7); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSSpringGuy].x, _hotspotsWalkPos[kHSSpringGuy].y, -1, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); break; case GRAB_CURSOR: diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp index 87d52bef4b..1ae51bc220 100644 --- a/engines/gnap/scenes/scene45.cpp +++ b/engines/gnap/scenes/scene45.cpp @@ -119,19 +119,19 @@ void GnapEngine::scene45_run() { initBeaverPos(4, 8, 0); endSceneInit(); } else if (_prevSceneNum == 46) { - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-1, 9, 5); endSceneInit(); platypusWalkTo(4, 8, -1, 0x107C2, 1); gnapWalkTo(2, 7, -1, 0x107B9, 1); } else if (_prevSceneNum == 41) { - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(11, 9, 5); endSceneInit(); platypusWalkTo(4, 8, -1, 0x107D2, 1); gnapWalkTo(10, 9, -1, 0x107BA, 1); } else { - initGnapPos(2, 11, 7); + initGnapPos(2, 11, kDirUpRight); initBeaverPos(6, 11, 5); endSceneInit(); platypusWalkTo(4, 8, -1, 0x107C2, 1); diff --git a/engines/gnap/scenes/scene46.cpp b/engines/gnap/scenes/scene46.cpp index 544829207e..37a000584c 100644 --- a/engines/gnap/scenes/scene46.cpp +++ b/engines/gnap/scenes/scene46.cpp @@ -101,19 +101,19 @@ void GnapEngine::scene46_run() { _gameSys->insertSequence(_toyUfoSequenceId | 0x10000, _toyUfoId, 0, 0, kSeqNone, 0, _toyUfoX - 274, _toyUfoY - 128); endSceneInit(); } else if (_prevSceneNum == 44) { - initGnapPos(-1, 8, 7); + initGnapPos(-1, 8, kDirUpRight); initBeaverPos(-1, 8, 5); endSceneInit(); platypusWalkTo(1, 8, -1, 0x107C2, 1); gnapWalkTo(2, 8, -1, 0x107B9, 1); } else if (_prevSceneNum == 45) { - initGnapPos(11, 8, 7); + initGnapPos(11, 8, kDirUpRight); initBeaverPos(12, 8, 5); endSceneInit(); gnapWalkTo(8, 8, -1, 0x107BA, 1); platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { - initGnapPos(5, 11, 7); + initGnapPos(5, 11, kDirUpRight); initBeaverPos(6, 11, 5); endSceneInit(); platypusWalkTo(5, 8, -1, 0x107C2, 1); @@ -203,7 +203,7 @@ void GnapEngine::scene46_run() { playGnapMoan1(_hotspotsWalkPos[kHSSackGuy].x + 1, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 5; + _gnapIdleFacing = kDirUpLeft; gnapWalkTo(_hotspotsWalkPos[kHSSackGuy].x, _hotspotsWalkPos[kHSSackGuy].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = 2; break; @@ -224,7 +224,7 @@ void GnapEngine::scene46_run() { playGnapMoan1(_hotspotsWalkPos[kHSItchyGuy].x - 1, 0); break; case TALK_CURSOR: - _gnapIdleFacing = 7; + _gnapIdleFacing = kDirUpRight; gnapWalkTo(_hotspotsWalkPos[kHSItchyGuy].x, _hotspotsWalkPos[kHSItchyGuy].y, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _gnapActionStatus = 1; break; |