From 81074f4503fbb09903c62f5dbb857c741c75cfc3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 7 May 2016 12:29:18 +0200 Subject: GNAP: use Common::Point for gnapWalkTo --- engines/gnap/scenes/group0.cpp | 186 +++++++++++++++++++------------------- engines/gnap/scenes/group1.cpp | 178 ++++++++++++++++++------------------ engines/gnap/scenes/group2.cpp | 198 ++++++++++++++++++++--------------------- engines/gnap/scenes/group3.cpp | 80 ++++++++--------- engines/gnap/scenes/group4.cpp | 126 +++++++++++++------------- 5 files changed, 382 insertions(+), 386 deletions(-) (limited to 'engines/gnap/scenes') diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index 3ba263dcbe..c47c195071 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -96,7 +96,7 @@ void Scene01::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(9, 6, -1, 0x107C2, 1); - _vm->gnapWalkTo(8, 6, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(8, 6), -1, 0x107B9, 1); } else { _vm->_gnap->initPos(1, 6, kDirBottomRight); if (_vm->isFlag(kGFPlatypus)) @@ -158,7 +158,7 @@ void Scene01::run() { switch (_vm->_verbCursor) { case LOOK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS01LookSpaceship; break; case GRAB_CURSOR: @@ -181,7 +181,7 @@ void Scene01::run() { _vm->playGnapScratchingHead(3, 3); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 3) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 3) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS01TakeMud; break; case TALK_CURSOR: @@ -201,17 +201,17 @@ void Scene01::run() { switch (_vm->_verbCursor) { case LOOK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 7, 2) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 7, 2) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS01LookPigs; break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 7, 2) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 7, 2) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS01UsePigs; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 7, 2) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 7, 2) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS01LookPigs; break; case PLAT_CURSOR: @@ -225,7 +225,7 @@ void Scene01::run() { case kHS01ExitTruck: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS01LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, -1, 0x107CD, 1); @@ -242,12 +242,12 @@ void Scene01::run() { case kHS01WalkArea7: case kHS01WalkArea8: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -418,14 +418,14 @@ void Scene02::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(9, 6, -1, 0x107C2, 1); - _vm->gnapWalkTo(8, 6, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 6), -1, 0x107BA, 1); break; case 4: _vm->_gnap->initPos(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, kDirBottomLeft); if (_vm->isFlag(kGFPlatypus)) _vm->_plat->initPos(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(7, 6, 0, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, 0x107B9, 1); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(8, 6, 1, 0x107C2, 1); updateHotspots(); @@ -450,7 +450,7 @@ void Scene02::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(2, 7, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); break; } @@ -504,8 +504,8 @@ void Scene02::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemTwig) { _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, - 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + Common::Point destPos = Common::Point(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1); + _vm->gnapWalkTo(destPos, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS02UseTwigWithChicken; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, 9, 8); @@ -516,14 +516,14 @@ void Scene02::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS02GrabChicken; else _vm->_gnap->_actionStatus = -1; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS02TalkChicken; break; case PLAT_CURSOR: @@ -538,7 +538,7 @@ void Scene02::run() { case kHS02Truck2: if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemKeys) { - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) { + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) { _vm->setGrabCursorSprite(-1); _vm->invRemove(kItemKeys); if (_vm->isFlag(kGFTruckFilledWithGas)) @@ -548,7 +548,7 @@ void Scene02::run() { } } else if (_vm->_grabCursorSpriteIndex == kItemGas) { _vm->_hotspots[kHS02WalkArea4]._flags |= SF_WALKABLE; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS02UseGasWithTruck; _vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -560,7 +560,7 @@ void Scene02::run() { break; case GRAB_CURSOR: if (_vm->isFlag(kGFTruckKeysUsed)) { - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) { + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) { if (_vm->isFlag(kGFTruckFilledWithGas)) _vm->_gnap->_actionStatus = kAS02UseTruckGas; else @@ -568,7 +568,7 @@ void Scene02::run() { } } else { _vm->_gnap->_idleFacing = kDirUnk4; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 2) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS02UseTruckNoKeys; } break; @@ -592,7 +592,7 @@ void Scene02::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS02GrabTruckGrill; break; case TALK_CURSOR: @@ -607,7 +607,7 @@ void Scene02::run() { case kHS02ExitHouse: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 0, 0x107AD, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[6], 0, 0x107AD, 1); _vm->_gnap->_actionStatus = kAS02LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, -1, 0x107C1, 1); @@ -619,7 +619,7 @@ void Scene02::run() { case kHS02ExitBarn: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, 0x107AD, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[7], 0, 0x107AD, 1); _vm->_gnap->_actionStatus = kAS02LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[7].x + 1, _vm->_hotspotsWalkPos[7].y, -1, 0x107C1, 1); @@ -631,7 +631,7 @@ void Scene02::run() { case kHS02ExitCreek: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[8], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS02LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, -1, 0x107CD, 1); @@ -642,7 +642,7 @@ void Scene02::run() { case kHS02ExitPigpen: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[9], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS02LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, -1, 0x107CF, 1); @@ -655,12 +655,12 @@ void Scene02::run() { case kHS02WalkArea3: case kHS02WalkArea4: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -926,7 +926,7 @@ void Scene03::run() { if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(4, 7, -1, 0x107C2, 1); - _vm->gnapWalkTo(3, 6, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(3, 6), -1, 0x107B9, 1); while (!_vm->_sceneDone) { _vm->updateMouseCursor(); @@ -968,7 +968,7 @@ void Scene03::run() { case kHS03Grass: if (_vm->_gnap->_actionStatus < 0) { if (_vm->isFlag(kGFGrassTaken)) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6); } else { @@ -996,7 +996,7 @@ void Scene03::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107AD, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, 0x107AD, 1); _vm->_gnap->_actionStatus = kAS03LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, -1, 0x107C2, 1); @@ -1020,7 +1020,7 @@ void Scene03::run() { case GRAB_CURSOR: if (!_vm->isFlag(kGFPlatypus)) _vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y + 1) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y + 1) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS03GrabCreek; if (!_vm->isFlag(kGFPlatypus)) _vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE; @@ -1037,7 +1037,7 @@ void Scene03::run() { case kHS03TrappedPlatypus: if (_vm->_gnap->_actionStatus < 0) { if (_vm->isFlag(kGFPlatypus)) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 4); } else { @@ -1047,10 +1047,10 @@ void Scene03::run() { break; case GRAB_CURSOR: if (_platypusHypnotized) { - _vm->gnapWalkTo(7, 6, 0, 0x107B5, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, 0x107B5, 1); _vm->_gnap->_actionStatus = kAS03FreePlatypus; } else { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); if (_platypusScared) _vm->_gnap->_actionStatus = kAS03GrabScaredPlatypus; else @@ -1062,7 +1062,7 @@ void Scene03::run() { _vm->playGnapBrainPulsating(8, 4); } else { _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); if (_platypusScared) _vm->_gnap->_actionStatus = kAS03HypnotizeScaredPlat; else @@ -1088,15 +1088,15 @@ void Scene03::run() { case kHS03WalkAreas2: case kHS03WalkAreas3: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS03PlatypusWalkArea: if (_vm->_gnap->_actionStatus < 0) { if (_vm->isFlag(kGFPlatypus) || _platypusHypnotized) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } else { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107B5, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, 0x107B5, 1); if (_platypusScared) _vm->_gnap->_actionStatus = kAS03GrabScaredPlatypus; else @@ -1107,7 +1107,7 @@ void Scene03::run() { default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1407,7 +1407,7 @@ void Scene04::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(5, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(6, 9, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(6, 9), -1, 0x107BA, 1); } else if (_vm->_prevSceneNum == 38) { _vm->_gnap->initPos(5, 7, kDirBottomRight); _vm->_plat->initPos(4, 7, kDirNone); @@ -1419,7 +1419,7 @@ void Scene04::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(9, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(9, 9, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(9, 9), -1, 0x107BA, 1); } } @@ -1507,7 +1507,7 @@ void Scene04::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS04GrabAxe; _vm->setFlag(kGFPlatypusTalkingToAssistant); updateHotspots(); @@ -1535,7 +1535,7 @@ void Scene04::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS04GrabDog; break; case TALK_CURSOR: @@ -1565,13 +1565,13 @@ void Scene04::run() { break; case GRAB_CURSOR: if (_vm->_cursorValue == 1) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS04OpenDoor; _vm->_timers[5] = 300; _vm->_gnap->_idleFacing = kDirUpLeft; } else { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS04LeaveScene; _vm->_newSceneNum = 38; } @@ -1587,7 +1587,7 @@ void Scene04::run() { case kHS04ExitTruck: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS04LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, -1, 0x107C7, 1); @@ -1607,7 +1607,7 @@ void Scene04::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, _vm->_gnap->getSequenceId(gskIdle, 10, 2) | 0x10000, 1)) { + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7], 0, _vm->_gnap->getSequenceId(gskIdle, 10, 2) | 0x10000, 1)) { if (_triedWindow) { _vm->_gnap->_actionStatus = kAS04GetKeyAnother; } else { @@ -1631,7 +1631,7 @@ void Scene04::run() { case kHS04ExitBarn: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[8], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS04LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y + 1, -1, 0x107C1, 1); @@ -1645,12 +1645,12 @@ void Scene04::run() { case kHS04WalkArea1: case kHS04WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1890,7 +1890,7 @@ void Scene05::run() { _vm->endSceneInit(); if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(2, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 9, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 9), -1, 0x107B9, 1); } else { _vm->_gnap->initPos(6, 8, kDirBottomRight); if (_vm->isFlag(kGFPlatypus)) @@ -1980,24 +1980,24 @@ void Scene05::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemTwig) { _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, - 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + Common::Point checkPt = _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot] + Common::Point(0, 1); + _vm->gnapWalkTo(checkPt, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS05UseTwigWithChicken; - } else if (_vm->_grabCursorSpriteIndex >= 0) { + } else if (_vm->_grabCursorSpriteIndex >= 0) _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7); - } else { + else { switch (_vm->_verbCursor) { case LOOK_CURSOR: _vm->playGnapMoan2(9, 7); break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS05GrabChicken; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS05TalkChicken; break; case PLAT_CURSOR: @@ -2019,7 +2019,7 @@ void Scene05::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirBottomLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS05GrabLadder; break; case TALK_CURSOR: @@ -2034,7 +2034,8 @@ void Scene05::run() { case kHS05Padlock: if (_vm->isFlag(kGFBarnPadlockOpen)) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x - 1, _vm->_hotspotsWalkPos[2].y + 1, 0, -1, 1); + Common::Point destPt = _vm->_hotspotsWalkPos[2] + Common::Point(- 1, 1); + _vm->gnapWalkTo(destPt, 0, -1, 1); _vm->_gnap->_actionStatus = kAS05EnterBarn; if (_vm->_cursorValue == 1) _vm->_newSceneNum = 6; @@ -2042,7 +2043,7 @@ void Scene05::run() { _vm->_newSceneNum = 36; } else if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemNeedle) { - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS05PickPadlock; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -2054,8 +2055,7 @@ void Scene05::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, - 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS05TryPickPadlock; break; case TALK_CURSOR: @@ -2070,7 +2070,7 @@ void Scene05::run() { case kHS05ExitHouse: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS05LeaveScene; if (_vm->isFlag(kGFPlatypus)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y + 1, -1, 0x107C7, 1); @@ -2084,7 +2084,7 @@ void Scene05::run() { case kHS05WalkArea1: case kHS05WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS05WalkArea3: @@ -2093,7 +2093,7 @@ void Scene05::run() { default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2320,7 +2320,7 @@ void Scene06::run() { _vm->endSceneInit(); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(5, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107B9, 1); while (!_vm->_sceneDone) { _vm->updateMouseCursor(); @@ -2382,7 +2382,7 @@ void Scene06::run() { _vm->playGnapImpossible(0, 0); } else if (triedDeviceOnGas) { _vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1], 0, 0x107BC, 1); _vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS06TryToGetGas; } else { @@ -2415,7 +2415,7 @@ void Scene06::run() { if (_vm->isFlag(kGFGasTaken)) _vm->playGnapImpossible(0, 0); else { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS06TryToClimbLadder; _vm->setFlag(kGFGasTaken); } @@ -2433,7 +2433,7 @@ void Scene06::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemTwig && _horseTurnedBack) { _vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, 0x107BC, 1); _vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE; _vm->_gnap->_idleFacing = kDirUpLeft; _vm->platypusWalkTo(6, 8, 1, 0x107C2, 1); @@ -2449,11 +2449,11 @@ void Scene06::run() { break; case TALK_CURSOR: if (_horseTurnedBack) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 3, 2) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 3, 2) | 0x10000, 1); } else { _vm->_gnap->_idleFacing = kDirBottomLeft; _vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS06TalkToHorse; } @@ -2470,7 +2470,7 @@ void Scene06::run() { case kHS06ExitOutsideBarn: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[4], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS06LeaveScene; if (_vm->_cursorValue == 1) _vm->_newSceneNum = 5; @@ -2485,12 +2485,12 @@ void Scene06::run() { case kHS06WalkArea4: case kHS06WalkArea5: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2739,9 +2739,9 @@ void Scene07::run() { case kHS07ExitHouse: _vm->_isLeavingScene = true; if (_vm->_gnap->_pos.x > 8) - _vm->gnapWalkTo(_vm->_gnap->_pos.x, 7, 0, 0x107AD, 1); + _vm->gnapWalkTo(Common::Point(_vm->_gnap->_pos.x, 7), 0, 0x107AD, 1); else - _vm->gnapWalkTo(8, 7, 0, 0x107AD, 1); + _vm->gnapWalkTo(Common::Point(8, 7), 0, 0x107AD, 1); _vm->_gnap->_actionStatus = kAS07LeaveScene; break; @@ -2783,7 +2783,7 @@ void Scene07::run() { case kHS07WalkArea1: case kHS07WalkArea2: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS07WalkArea3: @@ -2792,7 +2792,7 @@ void Scene07::run() { default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2956,7 +2956,7 @@ void Scene08::run() { _vm->endSceneInit(); - _vm->gnapWalkTo(1, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(1, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 7, -1, 0x107C2, 1); _vm->_timers[5] = _vm->getRandom(40) + 50; @@ -3011,7 +3011,7 @@ void Scene08::run() { case kHS08ExitBackdoor: _vm->_isLeavingScene = true; _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(0, 6, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(0, 6), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS08LeaveScene; _vm->platypusWalkTo(0, 7, 1, 0x107CF, 1); _vm->_newSceneNum = 9; @@ -3020,7 +3020,7 @@ void Scene08::run() { case kHS08ExitCrash: _vm->_isLeavingScene = true; _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(3, 9, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(3, 9), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS08LeaveScene; _vm->platypusWalkTo(4, 9, 1, 0x107C1, 1); _vm->_newSceneNum = 7; @@ -3033,7 +3033,7 @@ void Scene08::run() { switch (_vm->_verbCursor) { case LOOK_CURSOR: _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(6, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(6, 6), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS08LookMan; _vm->_gnap->_idleFacing = kDirUpRight; break; @@ -3043,7 +3043,7 @@ void Scene08::run() { case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(8, 6, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(8, 6), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS08TalkMan; break; case PLAT_CURSOR: @@ -3071,14 +3071,14 @@ void Scene08::run() { _vm->_gnap->_actionStatus = kAS08LookDog; break; case GRAB_CURSOR: - _vm->gnapWalkTo(4, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 7), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS08GrabDog; _vm->_gnap->_idleFacing = kDirUpRight; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(4, 7, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(4, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS08TalkDog; break; case PLAT_CURSOR: @@ -3175,13 +3175,13 @@ void Scene08::run() { case kHS08WalkArea1: case kHS08WalkArea2: _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(-1, 6, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, 6), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { _vm->gnapActionIdle(0x14D); - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -3386,7 +3386,7 @@ void Scene09::run() { _vm->_gnap->initPos(11, 8, kDirBottomLeft); _vm->_plat->initPos(12, 7, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(9, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(9, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 7, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(4, 7, kDirBottomRight); @@ -3439,7 +3439,7 @@ void Scene09::run() { case kHS09ExitKitchen: _vm->_isLeavingScene = true; _vm->_newSceneNum = 10; - _vm->gnapWalkTo(4, 7, 0, 0x107BF, 1); + _vm->gnapWalkTo(Common::Point(4, 7), 0, 0x107BF, 1); _vm->_gnap->_actionStatus = kAS09LeaveScene; _vm->platypusWalkTo(4, 8, -1, 0x107D2, 1); _vm->_plat->_idleFacing = kDirUnk4; @@ -3448,7 +3448,7 @@ void Scene09::run() { case kHS09ExitHouse: _vm->_isLeavingScene = true; _vm->_newSceneNum = 8; - _vm->gnapWalkTo(10, -1, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(10, -1), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS09LeaveScene; _vm->platypusWalkTo(10, -1, -1, 0x107CD, 1); _vm->_plat->_idleFacing = kDirUnk4; @@ -3464,7 +3464,7 @@ void Scene09::run() { break; case GRAB_CURSOR: _vm->_gnap->_actionStatus = kAS09SearchTrash; - _vm->gnapWalkTo(9, 6, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(9, 6), 0, 0x107BC, 1); break; case TALK_CURSOR: case PLAT_CURSOR: @@ -3477,12 +3477,12 @@ void Scene09::run() { case kHS09WalkArea1: case kHS09WalkArea2: case kHS09WalkArea3: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp index 3acce7f866..630a6940f8 100644 --- a/engines/gnap/scenes/group1.cpp +++ b/engines/gnap/scenes/group1.cpp @@ -75,13 +75,13 @@ void Scene10::run() { _vm->_gnap->initPos(11, 8, kDirBottomLeft); _vm->_plat->initPos(12, 7, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(9, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(9, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 7, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(-1, 7, kDirBottomRight); _vm->_plat->initPos(-2, 8, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(1, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(1, 7), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); } @@ -132,7 +132,7 @@ void Scene10::run() { case kHS10ExitBar: _vm->_isLeavingScene = true; _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(0, 7, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(0, 7), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS10LeaveScene; _vm->platypusWalkTo(0, 7, -1, 0x107CF, 1); _vm->_newSceneNum = 11; @@ -141,7 +141,7 @@ void Scene10::run() { case kHS10ExitBackdoor: _vm->_isLeavingScene = true; _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(2, 9, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(2, 9), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS10LeaveScene; _vm->platypusWalkTo(3, 9, -1, 0x107C7, 1); _vm->_newSceneNum = 9; @@ -164,14 +164,14 @@ void Scene10::run() { case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(4, 8, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS10AnnoyCook; break; case PLAT_CURSOR: _vm->gnapActionIdle(0x10C); _vm->_gnap->useDeviceOnPlatypus(); _vm->platypusWalkTo(4, 6, -1, -1, 1); - _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS10AnnoyCook; break; } @@ -194,7 +194,7 @@ void Scene10::run() { _vm->playGnapMoan2(-1, -1); else { _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS10AnnoyCook; } break; @@ -208,7 +208,7 @@ void Scene10::run() { _vm->gnapActionIdle(0x10C); _vm->_gnap->useDeviceOnPlatypus(); _vm->platypusWalkTo(3, 7, -1, -1, 1); - _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS10AnnoyCook; } break; @@ -226,7 +226,7 @@ void Scene10::run() { break; case GRAB_CURSOR: _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(4, 8, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS10AnnoyCook; break; case TALK_CURSOR: @@ -261,7 +261,7 @@ void Scene10::run() { break; case GRAB_CURSOR: _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(9, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(9, 6), 0, 0x107BB, 1); gameSys.insertSequence(0x10E, 120, makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, kSeqSyncWait, 0, 0, 0); _vm->_gnap->_sequenceId = 0x10E; _vm->_gnap->_id = 120; @@ -283,7 +283,7 @@ void Scene10::run() { case kHS10WalkArea3: case kHS10WalkArea4: _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS10Device: @@ -296,7 +296,7 @@ void Scene10::run() { default: if (_vm->_mouseClickState._left) { _vm->gnapActionIdle(0x10C); - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -573,7 +573,7 @@ void Scene11::run() { _vm->endSceneInit(); if (_vm->_prevSceneNum == 12) { - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); } @@ -612,7 +612,7 @@ void Scene11::run() { case kHS11ExitKitchen: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(6, 5, 0, 0x107BF, 1); + _vm->gnapWalkTo(Common::Point(6, 5), 0, 0x107BF, 1); _vm->_gnap->_actionStatus = kAS11LeaveScene; _vm->platypusWalkTo(6, 6, -1, -1, 1); _vm->_newSceneNum = 10; @@ -620,7 +620,7 @@ void Scene11::run() { case kHS11ExitToilet: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(8, 5, 0, 0x107BF, 1); + _vm->gnapWalkTo(Common::Point(8, 5), 0, 0x107BF, 1); _vm->_gnap->_actionStatus = kAS11LeaveScene; _vm->platypusWalkTo(8, 6, -1, -1, 1); _vm->_newSceneNum = 13; @@ -628,7 +628,7 @@ void Scene11::run() { case kHS11ExitLeft: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(-1, 8, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(-1, 8), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS11LeaveScene; _vm->platypusWalkTo(-1, 9, -1, 0x107CF, 1); _vm->_newSceneNum = 12; @@ -637,7 +637,7 @@ void Scene11::run() { case kHS11GoggleGuy: if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemMagazine) { - _vm->gnapWalkTo(3, 7, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS11ShowMagazineToGoggleGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0); } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -653,7 +653,7 @@ void Scene11::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(3, 7, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(3, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS11TalkGoggleGuy; break; } @@ -665,7 +665,7 @@ void Scene11::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_gnap->_idleFacing = kDirUpRight; if (_vm->_grabCursorSpriteIndex >= 0) { - _vm->gnapWalkTo(5, 6, 0, 0x107BC, 9); + _vm->gnapWalkTo(Common::Point(5, 6), 0, 0x107BC, 9); _vm->_gnap->_actionStatus = kAS11ShowItemToHookGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 4, 0); } else { @@ -674,12 +674,12 @@ void Scene11::run() { _vm->_gnap->playSequence(_vm->_gnap->getSequenceId(gskDeflect, 3, 6) | 0x10000); break; case GRAB_CURSOR: - _vm->gnapWalkTo(5, 6, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(5, 6), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS11GrabHookGuy; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirBottomLeft; - _vm->gnapWalkTo(5, 6, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(5, 6), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS11TalkHookGuy; break; case PLAT_CURSOR: @@ -700,7 +700,7 @@ void Scene11::run() { _vm->playGnapScratchingHead(9, 8); break; case GRAB_CURSOR: - _vm->gnapWalkTo(9, 8, 0, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(9, 8), 0, 0x107BA, 1); _vm->_gnap->_actionStatus = kAS11GrabBillardBall; break; case TALK_CURSOR: @@ -718,7 +718,7 @@ void Scene11::run() { case kHS11WalkArea4: case kHS11WalkArea5: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS11Device: @@ -730,7 +730,7 @@ void Scene11::run() { default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -989,7 +989,7 @@ void Scene12::run() { _vm->_gnap->initPos(11, 8, kDirBottomLeft); _vm->_plat->initPos(12, 8, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1); } @@ -1030,7 +1030,7 @@ void Scene12::run() { case kHS12ExitRight: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(10, -1, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(10, -1), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS12LeaveScene; _vm->platypusWalkTo(10, -1, -1, -1, 1); _vm->_newSceneNum = 11; @@ -1039,18 +1039,18 @@ void Scene12::run() { case kHS12ToothGuy: if (_vm->_grabCursorSpriteIndex == kItemQuarter) { _vm->_largeSprite = gameSys.createSurface(0x141); - _vm->gnapWalkTo(3, 7, 0, 0x107BC, 9); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 0x107BC, 9); _vm->_gnap->_idleFacing = kDirUpLeft; _vm->_gnap->_actionStatus = kAS12QuarterToToothGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0); _vm->setGrabCursorSprite(-1); } else if (_vm->_grabCursorSpriteIndex == kItemQuarterWithHole) { - _vm->gnapWalkTo(3, 7, 0, 0x107BC, 9); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 0x107BC, 9); _vm->_gnap->_idleFacing = kDirUpLeft; _vm->_gnap->_actionStatus = kAS12QuarterWithHoleToToothGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0); } else if (_vm->_grabCursorSpriteIndex >= 0) { - _vm->gnapWalkTo(3, 7, 0, 0x107BC, 9); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 0x107BC, 9); _vm->_gnap->_idleFacing = kDirUpLeft; _vm->_gnap->_actionStatus = kAS12ShowItemToToothGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0); @@ -1060,12 +1060,12 @@ void Scene12::run() { _vm->playGnapScratchingHead(1, 2); break; case GRAB_CURSOR: - _vm->gnapWalkTo(3, 7, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS12GrabToothGuy; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(3, 7, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(3, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS12TalkToothGuy; break; case PLAT_CURSOR: @@ -1081,19 +1081,19 @@ void Scene12::run() { case kHS12Barkeeper: if (_vm->_grabCursorSpriteIndex == kItemQuarter || _vm->_grabCursorSpriteIndex == kItemQuarterWithHole) { - _vm->gnapWalkTo(6, 6, 0, 0x107BB, 9); + _vm->gnapWalkTo(Common::Point(6, 6), 0, 0x107BB, 9); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12QuarterWithBarkeeper; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 7, 0); } else if (_vm->_grabCursorSpriteIndex >= 0) { - _vm->gnapWalkTo(6, 6, 0, 0x107BB, 9); + _vm->gnapWalkTo(Common::Point(6, 6), 0, 0x107BB, 9); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12ShowItemToBarkeeper; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 7, 0); } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(6, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(6, 6), 0, 0x107BB, 1); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12LookBarkeeper; break; @@ -1102,7 +1102,7 @@ void Scene12::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(6, 6, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(6, 6), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS12TalkBarkeeper; break; case PLAT_CURSOR: @@ -1116,26 +1116,26 @@ void Scene12::run() { case kHS12BeardGuy: if (_vm->_grabCursorSpriteIndex >= 0) { - _vm->gnapWalkTo(7, 6, 0, 0x107BB, 9); + _vm->gnapWalkTo(Common::Point(7, 6), 0, 0x107BB, 9); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12ShowItemToBeardGuy; _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 0); } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(7, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, 0x107BB, 1); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12LookBeardGuy; break; case GRAB_CURSOR: // NOTE Bug in the original. It has 9 as flags which seems wrong here. - _vm->gnapWalkTo(7, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, 0x107BB, 1); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS12GrabBeardGuy; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(7, 6, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS12TalkBeardGuy; break; case PLAT_CURSOR: @@ -1152,7 +1152,7 @@ void Scene12::run() { case kHS12Jukebox: _vm->_newSceneNum = 15; _vm->_isLeavingScene = true; - _vm->gnapWalkTo(5, 6, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(5, 6), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS12LeaveScene; break; @@ -1161,12 +1161,12 @@ void Scene12::run() { case kHS12WalkArea3: case kHS12WalkArea4: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1539,7 +1539,7 @@ void Scene13::run() { case kHS13ExitBar: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(2, 7, 0, 0x107C0, 1); + _vm->gnapWalkTo(Common::Point(2, 7), 0, 0x107C0, 1); _vm->_gnap->_actionStatus = kAS13LeaveScene; _vm->platypusWalkTo(2, 8, -1, -1, 1); if (_vm->isFlag(kGFUnk14) || _vm->isFlag(kGFSpringTaken)) { @@ -1569,7 +1569,7 @@ void Scene13::run() { _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_sequenceDatNum = 0; } else { - _vm->gnapWalkTo(5, 5, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(5, 5), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS13BackToilet; _vm->_gnap->_idleFacing = kDirUpRight; } @@ -1590,7 +1590,7 @@ void Scene13::run() { case GRAB_CURSOR: case TALK_CURSOR: case PLAT_CURSOR: - _vm->gnapWalkTo(6, 7, 0, 0xA9, 5); + _vm->gnapWalkTo(Common::Point(6, 7), 0, 0xA9, 5); _vm->_gnap->_actionStatus = kAS13FrontToilet; _vm->_gnap->_idleFacing = kDirBottomRight; break; @@ -1604,7 +1604,7 @@ void Scene13::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(7, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(7, 7), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS13LookScribble; _vm->_gnap->_idleFacing = kDirUpRight; break; @@ -1613,7 +1613,7 @@ void Scene13::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(7, 7, -1, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0), 1); + _vm->gnapWalkTo(Common::Point(7, 7), -1, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0), 1); break; case PLAT_CURSOR: _vm->playGnapImpossible(0, 0); @@ -1633,7 +1633,7 @@ void Scene13::run() { _vm->_gnap->_actionStatus = kAS13Wait; break; case GRAB_CURSOR: - _vm->gnapWalkTo(8, 7, 0, -1, 1); + _vm->gnapWalkTo(Common::Point(8, 7), 0, -1, 1); _vm->_gnap->_actionStatus = kAS13GrabUrinal; break; case TALK_CURSOR: @@ -1655,7 +1655,7 @@ void Scene13::run() { _vm->_gnap->_actionStatus = kAS13Wait; break; case GRAB_CURSOR: - _vm->gnapWalkTo(4, 8, 0, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 8), 0, 0x107B9, 1); _vm->_gnap->_actionStatus = kAS13GrabSink; break; case TALK_CURSOR: @@ -1674,7 +1674,7 @@ void Scene13::run() { case kHS13WalkArea7: case kHS13WalkArea8: case kHS13WalkArea9: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; case kHS13WalkArea1: @@ -1683,7 +1683,7 @@ void Scene13::run() { default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2322,7 +2322,7 @@ void Scene17::update() { _vm->updateMouseCursor(); _vm->updateGrabCursorSprite(0, 0); if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } } @@ -2419,7 +2419,7 @@ void Scene17::run() { _vm->_plat->initPos(5, 6, kDirNone); _vm->endSceneInit(); _vm->platypusWalkTo(5, 9, -1, 0x107C2, 1); - _vm->gnapWalkTo(4, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 8), -1, 0x107B9, 1); } else if (_vm->isFlag(kGFUnk27)) { _vm->_gnap->initPos(3, 9, kDirUpLeft); _vm->_plat->_pos = _vm->_hotspotsWalkPos[2]; @@ -2473,7 +2473,7 @@ void Scene17::run() { _vm->_plat->initPos(5, 6, kDirNone); _vm->endSceneInit(); _vm->platypusWalkTo(5, 9, -1, 0x107C2, 1); - _vm->gnapWalkTo(4, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 8), -1, 0x107B9, 1); } else { if (_vm->isFlag(kGFSpringTaken)) { _vm->_gnap->initPos(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, kDirBottomRight); @@ -2532,7 +2532,7 @@ void Scene17::run() { } else { _vm->_gnap->useDeviceOnPlatypus(); _vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 1, 0x107C2, 1); - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[6] + Common::Point(1, 0), 0, 0x107BA, 1); _vm->_plat->_actionStatus = kAS17GetWrench1; _vm->_gnap->_actionStatus = kAS17GetWrench1; _vm->_timers[5] = _vm->getRandom(30) + 80; @@ -2593,7 +2593,7 @@ void Scene17::run() { case kHS17Phone1: if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS17PutCoinIntoPhone; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3); @@ -2634,7 +2634,7 @@ void Scene17::run() { case kHS17Phone2: if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS17PutCoinIntoPhone; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3); @@ -2648,7 +2648,7 @@ void Scene17::run() { platHangUpPhone(); _vm->_isLeavingScene = true; _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS17GnapUsePhone; _vm->setFlag(kGFSpringTaken); } else @@ -2680,7 +2680,7 @@ void Scene17::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 18; _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[5], 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS17LeaveScene; if (_vm->_plat->_actionStatus != kAS17PlatPhoningAssistant) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[5].x - 1, _vm->_hotspotsWalkPos[5].y, -1, 0x107C2, 1); @@ -2693,7 +2693,7 @@ void Scene17::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS17LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y, -1, 0x107C2, 1); } @@ -2703,12 +2703,12 @@ void Scene17::run() { case kHS17WalkArea2: case kHS17WalkArea3: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = 0; } break; @@ -2998,7 +2998,7 @@ void Scene17::updateAnimations() { _vm->_plat->_sequenceDatNum = 0; _vm->_gnap->_sequenceId = 0x875; _vm->_plat->_sequenceId = 0x23F; - _vm->gnapWalkTo(3, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(3, 8), -1, 0x107B9, 1); _vm->_plat->_actionStatus = kAS17GetWrench2; } break; @@ -3302,7 +3302,7 @@ void Scene18::closeHydrantValve() { _vm->_gnap->_actionStatus = kAS18LeaveScene; _vm->updateMouseCursor(); if (_vm->isFlag(kGFTruckFilledWithGas)) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 0, 0x107BA, 1); if (_vm->isFlag(kGFTruckKeysUsed)) { _vm->_gnap->_actionStatus = kAS18CloseRightValveWithGarbageCan; waitForGnapAction(); @@ -3311,7 +3311,7 @@ void Scene18::closeHydrantValve() { waitForGnapAction(); } } else if (_vm->isFlag(kGFBarnPadlockOpen)) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 0, 0x107BA, 1); _vm->_gnap->_actionStatus = kAS18CloseTopValve; waitForGnapAction(); } @@ -3384,7 +3384,7 @@ void Scene18::run() { } else { gameSys.setAnimation(_currPhoneSequenceId, 254, 3); } - _vm->gnapWalkTo(4, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 8), -1, 0x107B9, 1); } else { if (_vm->isFlag(kGFGnapControlsToyUFO)) { _vm->clearFlag(kGFGnapControlsToyUFO); @@ -3395,19 +3395,19 @@ void Scene18::run() { _vm->_gnap->initPos(4, 11, kDirBottomRight); _vm->_plat->initPos(5, 11, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(4, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(5, 9, -1, 0x107C2, 1); } else if (_vm->_prevSceneNum == 19) { _vm->_gnap->initPos(7, 7, kDirBottomRight); _vm->_plat->initPos(8, 7, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(7, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(7, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(8, 8, -1, 0x107C2, 1); } else { _vm->_gnap->initPos(-1, 10, kDirBottomRight); _vm->_plat->initPos(-1, 10, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(3, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(3, 7), -1, 0x107B9, 1); _vm->platypusWalkTo(3, 8, -1, 0x107C2, 1); } } @@ -3476,7 +3476,7 @@ void Scene18::run() { _vm->playGnapScratchingHead(3, 2); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat].x, _vm->_hotspotsWalkPos[kHS18CowboyHat].y, 0, _vm->_gnap->getSequenceId(gskPullOutDeviceNonWorking, 3, 2) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat], 0, _vm->_gnap->getSequenceId(gskPullOutDeviceNonWorking, 3, 2) | 0x10000, 1); break; case TALK_CURSOR: case PLAT_CURSOR: @@ -3513,12 +3513,12 @@ void Scene18::run() { break; case GRAB_CURSOR: if (!_vm->isFlag(kGFTruckKeysUsed)) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1), _vm->_hotspotsWalkPos[kHS18GarbageCan].y, + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan] + Common::Point((_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1), 0), -1, -1, 1); _vm->gnapWalkTo(_vm->_gnap->_pos, 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_s18GarbageCanPos, _vm->_gnap->_pos.y) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS18GrabGarbageCanFromStreet; } else if (!_vm->isFlag(kGFTruckFilledWithGas)) { - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 0, -1, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18GarbageCan], 0, -1, 1)) _vm->_gnap->_actionStatus = kAS18GrabGarbageCanFromHydrant; } break; @@ -3582,7 +3582,7 @@ void Scene18::run() { case GRAB_CURSOR: if (_vm->isFlag(kGFBarnPadlockOpen)) { _vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 0, 0x107BA, 1); _vm->_hotspots[kHS18WalkArea2]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS18CloseTopValve; } else @@ -3626,7 +3626,7 @@ void Scene18::run() { break; case GRAB_CURSOR: if (_vm->isFlag(kGFTruckFilledWithGas)) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 0, 0x107BA, 1); if (_vm->isFlag(kGFTruckKeysUsed)) _vm->_gnap->_actionStatus = kAS18CloseRightValveWithGarbageCan; else @@ -3654,7 +3654,7 @@ void Scene18::run() { } else { _vm->_isLeavingScene = true; _vm->_newSceneNum = 19; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitToyStore].x, _vm->_hotspotsWalkPos[kHS18ExitToyStore].y, 0, 0x107C0, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitToyStore], 0, 0x107C0, 1); _vm->_gnap->_actionStatus = kAS18LeaveScene; if (!_vm->isFlag(kGFPlatypusTalkingToAssistant)) _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS18ExitToyStore].x + 1, _vm->_hotspotsWalkPos[kHS18ExitToyStore].y, -1, 0x107C2, 1); @@ -3671,7 +3671,7 @@ void Scene18::run() { closeHydrantValve(); _vm->_isLeavingScene = true; _vm->_newSceneNum = 17; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitPhoneBooth].x, _vm->_hotspotsWalkPos[kHS18ExitPhoneBooth].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitPhoneBooth], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS18LeaveScene; if (_vm->isFlag(kGFPlatypusTalkingToAssistant)) _vm->setFlag(kGFUnk27); @@ -3690,7 +3690,7 @@ void Scene18::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; _vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitGrubCity].x, _vm->_hotspotsWalkPos[kHS18ExitGrubCity].y, 0, 0x107B2, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18ExitGrubCity], 0, 0x107B2, 1); _vm->_gnap->_actionStatus = kAS18LeaveScene; if (_vm->isFlag(kGFPlatypusTalkingToAssistant)) platEndPhoning(false); @@ -3707,7 +3707,7 @@ void Scene18::run() { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } _vm->_mouseClickState._left = false; } @@ -3719,7 +3719,7 @@ void Scene18::run() { gnapCarryGarbageCanTo(-1); putDownGarbageCan(0); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } _vm->_mouseClickState._left = false; } @@ -3840,7 +3840,7 @@ void Scene18::updateAnimations() { _vm->playGnapUseDevice(0, 0); gameSys.insertSequence(0x20C, 19, 0, 0, kSeqNone, 0, 0, 0); _vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 0, 0x107BB, 1); _vm->_hotspots[kHS18WalkArea2]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS18OpenTopValveDone; break; @@ -3938,7 +3938,7 @@ void Scene18::updateAnimations() { _vm->playGnapUseDevice(0, 0); gameSys.insertSequence(0x20B, 19, 0, 0, kSeqNone, 0, 0, 0); _vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 0, 0x107BA, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 0, 0x107BA, 1); _vm->_hotspots[kHS18WalkArea2]._flags &= ~SF_WALKABLE; if (_vm->_gnap->_actionStatus == kAS18OpenRightValveNoGarbageCan) _vm->_gnap->_actionStatus = kAS18OpenRightValveNoGarbageCanDone; @@ -4107,7 +4107,7 @@ void Scene19::run() { gameSys.insertSequence(_currShopAssistantSequenceId, 20, 0, 0, kSeqNone, 0, 0, 0); _shopAssistantCtr = 0; _vm->endSceneInit(); - _vm->gnapWalkTo(4, 9, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 9), -1, 0x107B9, 1); updateHotspots(); } else { _currShopAssistantSequenceId = 0x6D; @@ -4118,7 +4118,7 @@ void Scene19::run() { _vm->_gnap->initPos(3, 6, kDirBottomRight); _vm->_plat->initPos(4, 6, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(4, 9, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(4, 9), -1, 0x107B9, 1); _vm->platypusWalkTo(5, 9, -1, 0x107C2, 1); } @@ -4170,7 +4170,7 @@ void Scene19::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 18; _vm->_hotspots[kHS19WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107B2, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[1], 0, 0x107B2, 1); _vm->_gnap->_actionStatus = kAS19LeaveScene; if (_vm->isFlag(kGFPlatypusTalkingToAssistant)) _vm->setFlag(kGFUnk27); @@ -4215,7 +4215,7 @@ void Scene19::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS19TalkShopAssistant; break; case GRAB_CURSOR: @@ -4243,7 +4243,7 @@ void Scene19::run() { _vm->playGnapMoan2(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 0, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1); _vm->playGnapIdle(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y); _vm->_gnap->_actionStatus = kAS19GrabToy; break; @@ -4266,7 +4266,7 @@ void Scene19::run() { _vm->playGnapScratchingHead(9, 1); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 0, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1); _vm->playGnapIdle(8, 2); _vm->_gnap->_actionStatus = kAS19UsePhone; break; @@ -4283,12 +4283,12 @@ void Scene19::run() { case kHS19WalkArea2: case kHS19WalkArea3: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = 0; } } diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp index 237000dfe2..8b742eea9d 100644 --- a/engines/gnap/scenes/group2.cpp +++ b/engines/gnap/scenes/group2.cpp @@ -208,7 +208,7 @@ void Scene20::run() { } _vm->_gnap->initPos(11, 8, kDirBottomLeft); _vm->_plat->initPos(11, 9, kDirUnk4); - _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 9, -1, 0x107C2, 1); } else { switch (_vm->_prevSceneNum) { @@ -216,28 +216,28 @@ void Scene20::run() { _vm->_gnap->initPos(5, 11, kDirBottomRight); _vm->_plat->initPos(6, 11, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 9, -1, 0x107C2, 1); break; case 18: _vm->_gnap->initPos(11, 8, kDirBottomLeft); _vm->_plat->initPos(11, 9, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 9, -1, 0x107C2, 1); break; case 21: _vm->_gnap->initPos(-1, 8, kDirBottomLeft); _vm->_plat->initPos(-1, 9, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(3, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(3, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(3, 9, -1, 0x107C2, 1); break; case 22: _vm->_gnap->initPos(7, 6, kDirBottomRight); _vm->_plat->initPos(8, 6, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(9, 9, -1, 0x107C2, 1); break; default: @@ -245,7 +245,7 @@ void Scene20::run() { _vm->_plat->initPos(9, 6, kDirUnk4); _vm->endSceneInit(); _vm->_hotspots[kHS20WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 9, -1, 0x107C2, 1); _vm->_hotspots[kHS20WalkArea2]._flags &= ~SF_WALKABLE; break; @@ -302,7 +302,7 @@ void Scene20::run() { _vm->_timers[4] = 0; _vm->_isLeavingScene = true; _vm->_newSceneNum = 21; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitParkingLot].x, _vm->_hotspotsWalkPos[kHS20ExitParkingLot].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitParkingLot], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS20LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitParkingLot].x, _vm->_hotspotsWalkPos[kHS20ExitParkingLot].y + 1, -1, 0x107CF, 1); _vm->_plat->_idleFacing = kDirUnk4; @@ -315,7 +315,7 @@ void Scene20::run() { _vm->_timers[4] = 0; _vm->_isLeavingScene = true; _vm->_newSceneNum = 17; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitPhone].x, _vm->_hotspotsWalkPos[kHS20ExitPhone].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitPhone], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS20LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitPhone].x + 1, _vm->_hotspotsWalkPos[kHS20ExitPhone].y, -1, 0x107C2, 1); } @@ -328,7 +328,7 @@ void Scene20::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 18; _vm->_hotspots[kHS20WalkArea2]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideToyStore].x, _vm->_hotspotsWalkPos[kHS20ExitOutsideToyStore].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideToyStore], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS20LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideToyStore].x, _vm->_hotspotsWalkPos[kHS20ExitOutsideToyStore].y + 1, -1, 0x107CD, 1); _vm->_hotspots[kHS20WalkArea2]._flags &= ~SF_WALKABLE; @@ -341,7 +341,7 @@ void Scene20::run() { _vm->_timers[4] = 0; _vm->_isLeavingScene = true; _vm->_newSceneNum = 22; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity].x, _vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity].y - 1, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity] + Common::Point(0, - 1), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS20LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity].x + 1, _vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity].y, -1, 0x107C2, 1); _vm->_plat->_idleFacing = kDirUnk4; @@ -354,7 +354,7 @@ void Scene20::run() { _vm->_timers[4] = 0; _vm->_isLeavingScene = true; _vm->_newSceneNum = 24; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].x, _vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld], 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS20LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS20ExitOutsideCircusWorld].y, -1, 0x107C2, 1); } @@ -371,7 +371,7 @@ void Scene20::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy].x, _vm->_hotspotsWalkPos[kHS20StonerGuy].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); if (_stonerGuyShowingJoint) _vm->_gnap->_actionStatus = kAS20GrabJoint; else @@ -379,7 +379,7 @@ void Scene20::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy].x, _vm->_hotspotsWalkPos[kHS20StonerGuy].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20StonerGuy], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); if (_vm->isFlag(kGFJointTaken)) _vm->_gnap->_actionStatus = kAS20TalkStonerGuyNoJoint; else @@ -405,12 +405,12 @@ void Scene20::run() { case GRAB_CURSOR: _stonerGuyShowingJoint = false; _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS20GrabGroceryStoreGuy; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS20TalkGroceryStoreGuy; break; case PLAT_CURSOR: @@ -425,7 +425,7 @@ void Scene20::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemCowboyHat) { _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreHat].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS20SwitchGroceryStoreHat; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreHat].y, 1, 6); @@ -437,7 +437,7 @@ void Scene20::run() { case GRAB_CURSOR: _stonerGuyShowingJoint = false; _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS20GrabGroceryStoreHat; break; case TALK_CURSOR: @@ -451,12 +451,12 @@ void Scene20::run() { case kHS20WalkArea1: case kHS20WalkArea2: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -625,7 +625,7 @@ void Scene20::updateAnimations() { _vm->showCursor(); _vm->setGrabCursorSprite(kItemGroceryStoreHat); _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(3, 8, -1, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(3, 8), -1, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = -1; break; case kAS20GrabJointDone: @@ -674,7 +674,7 @@ void Scene20::updateAnimations() { _currGroceryStoreGuySequenceId = 377; _nextGroceryStoreGuySequenceId = -1; _nextStonerGuySequenceId = -1; - _vm->gnapWalkTo(4, 8, -1, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 8), -1, 0x107BB, 1); break; case 0x17C: gameSys.setAnimation(0, 0, 3); @@ -757,7 +757,7 @@ void Scene21::run() { if (!_vm->isFlag(kGFUnk04)) gameSys.insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); } } else { @@ -769,7 +769,7 @@ void Scene21::run() { _nextOldLadySequenceId = -1; _vm->_timers[4] = _vm->getRandom(30) + 50; _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); } @@ -841,7 +841,7 @@ void Scene21::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemGroceryStoreHat) { _vm->_newSceneNum = 47; - _vm->gnapWalkTo(4, 6, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(4, 6), 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS21UseHatWithOldLady; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(4, 6, 7, 4); @@ -853,13 +853,13 @@ void Scene21::run() { case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; _vm->_hotspots[kHS21WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(7, 6, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(7, 6), 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS21GrabOldLady; _vm->_hotspots[kHS21WalkArea1]._flags &= ~SF_WALKABLE; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS21OldLady].x, _vm->_hotspotsWalkPos[kHS21OldLady].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS21OldLady], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS21TalkOldLady; break; case PLAT_CURSOR: @@ -874,7 +874,7 @@ void Scene21::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].x, _vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].y, 0, 0x107B3, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity], 0, 0x107B3, 1); _vm->_gnap->_actionStatus = kAS21LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].x + 1, _vm->_hotspotsWalkPos[kHS21ExitOutsideGrubCity].y, -1, 0x107C2, 1); } @@ -882,12 +882,12 @@ void Scene21::run() { case kHS21WalkArea1: case kHS21WalkArea2: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1050,7 +1050,7 @@ void Scene22::run() { _vm->_gnap->initPos(11, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y, kDirBottomRight); _vm->_plat->initPos(11, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y + 1, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(9, 8, -1, 0x107C2, 1); } @@ -1134,7 +1134,7 @@ void Scene22::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22ExitOutsideGrubCity].x, _vm->_hotspotsWalkPos[kHS22ExitOutsideGrubCity].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22ExitOutsideGrubCity], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS22LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS22ExitOutsideGrubCity].x, _vm->_hotspotsWalkPos[kHS22ExitOutsideGrubCity].y + 1, -1, 0x107C2, 1); } @@ -1144,7 +1144,7 @@ void Scene22::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 23; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].x, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22ExitBackGrubCity], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS22LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].x, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y + 1, -1, 0x107C2, 1); } @@ -1164,8 +1164,7 @@ void Scene22::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22Cashier].x, _vm->_hotspotsWalkPos[kHS22Cashier].y, - 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS22Cashier], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS22TalkCashier; break; case PLAT_CURSOR: @@ -1178,12 +1177,12 @@ void Scene22::run() { case kHS22WalkArea1: case kHS22WalkArea2: - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1302,9 +1301,9 @@ void Scene23::run() { _vm->platypusWalkTo(1, 7, -1, 0x107C2, 1); if (_vm->isFlag(kGFUnk24)) { - _vm->gnapWalkTo(2, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 7), -1, 0x107B9, 1); } else { - _vm->gnapWalkTo(2, 7, 0, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 7), 0, 0x107B9, 1); while (gameSys.getAnimationStatus(0) != 2) _vm->gameUpdateTick(); _vm->playSequences(0x48, 0xBA, 0xBB, 0xBC); @@ -1364,8 +1363,7 @@ void Scene23::run() { if (_vm->isFlag(kGFSceneFlag1)) _vm->playGnapMoan2(0, 0); else { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23Cereals].x, _vm->_hotspotsWalkPos[kHS23Cereals].y, - 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS23LookCereals; } break; @@ -1374,8 +1372,7 @@ void Scene23::run() { _vm->playGnapImpossible(0, 0); else { _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23Cereals].x, _vm->_hotspotsWalkPos[kHS23Cereals].y, - 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->setFlag(kGFSceneFlag1); _vm->_gnap->_actionStatus = kAS23GrabCereals; _vm->invAdd(kItemCereals); @@ -1394,7 +1391,7 @@ void Scene23::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 22; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].x, _vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS23LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].x, _vm->_hotspotsWalkPos[kHS23ExitFrontGrubCity].y - 1, -1, 0x107C2, 1); } @@ -1403,12 +1400,12 @@ void Scene23::run() { case kHS23WalkArea1: case kHS23WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1569,13 +1566,13 @@ void Scene24::run() { _vm->_gnap->initPos(1, 8, kDirBottomRight); _vm->_plat->initPos(2, 8, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(1, 9, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(1, 9), -1, 0x107B9, 1); _vm->platypusWalkTo(2, 9, -1, 0x107C2, 1); } else { _vm->_gnap->initPos(8, 8, kDirBottomLeft); _vm->_plat->initPos(8, 8, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(3, 8, -1, 0x107C2, 1); } @@ -1627,7 +1624,7 @@ void Scene24::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 25; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS24ExitCircusWorld].x, _vm->_hotspotsWalkPos[kHS24ExitCircusWorld].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS24ExitCircusWorld], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS24LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS24ExitCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS24ExitCircusWorld].y, -1, 0x107C2, 1); } @@ -1638,7 +1635,7 @@ void Scene24::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 20; _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].x, _vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS24LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].x + 1, _vm->_hotspotsWalkPos[kHS24ExitOutsideGrubCity].y, -1, 0x107C2, 1); } @@ -1648,12 +1645,12 @@ void Scene24::run() { case kHS24WalkArea2: case kHS24WalkArea3: if (_vm->_gnap->_actionStatus == -1) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1818,13 +1815,13 @@ void Scene25::run() { _vm->_gnap->initPos(5, 11, kDirUpLeft); _vm->_plat->initPos(6, 11, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 7, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 7), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 7, -1, 0x107C2, 1); } else { _vm->_gnap->initPos(5, 6, kDirBottomRight); _vm->_plat->initPos(6, 6, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); } @@ -1873,8 +1870,7 @@ void Scene25::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemTickets) { _vm->_gnap->_actionStatus = kAS25ShowTicketToVendor; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, - 0, _vm->_gnap->getSequenceId(gskIdle, 9, 4) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, _vm->_gnap->getSequenceId(gskIdle, 9, 4) | 0x10000, 1); _vm->playGnapPullOutDevice(0, 0); _vm->playGnapUseDevice(0, 0); } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -1888,7 +1884,7 @@ void Scene25::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS25TalkTicketVendor; break; case GRAB_CURSOR: @@ -1904,7 +1900,7 @@ void Scene25::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 24; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].x, _vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].y, 0, 0x107B4, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld], 0, 0x107B4, 1); _vm->_gnap->_actionStatus = kAS25LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS25ExitOutsideCircusWorld].y, -1, 0x107C2, 1); } @@ -1916,13 +1912,13 @@ void Scene25::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 26; _vm->_hotspots[kHS25WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25ExitInsideCircusWorld].x, _vm->_hotspotsWalkPos[kHS25ExitInsideCircusWorld].y, 0, 0x107B1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS25ExitInsideCircusWorld], 0, 0x107B1, 1); _vm->_gnap->_actionStatus = kAS25LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS25ExitInsideCircusWorld].x + 1, _vm->_hotspotsWalkPos[kHS25ExitInsideCircusWorld].y, -1, 0x107C2, 1); _vm->_hotspots[kHS25WalkArea1]._flags &= ~SF_WALKABLE; } else { _vm->_hotspots[kHS25WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(4, 5, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(4, 5), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS25EnterCircusWihoutTicket; _vm->_hotspots[kHS25WalkArea1]._flags &= ~SF_WALKABLE; } @@ -1939,7 +1935,7 @@ void Scene25::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, -1, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], -1, -1, 1); if (_vm->_sceneClickedHotspot == 5 || _vm->_sceneClickedHotspot == 6) _vm->_gnap->_idleFacing = kDirUpLeft; else if (_vm->_sceneClickedHotspot == 8) @@ -1962,12 +1958,12 @@ void Scene25::run() { case kHS25WalkArea1: case kHS25WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2048,7 +2044,7 @@ void Scene25::updateAnimations() { _nextTicketVendorSequenceId = -1; _vm->_hotspots[kHS25WalkArea1]._flags |= SF_WALKABLE; _vm->playGnapIdle(0, 0); - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, -1, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[3], -1, 0x107BB, 1); _vm->_hotspots[kHS25WalkArea1]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS25EnterCircusWihoutTicketDone; break; @@ -2137,7 +2133,7 @@ void Scene26::run() { _vm->_gnap->initPos(-1, 8, kDirBottomRight); _vm->_plat->initPos(-2, 8, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); } else { _vm->_gnap->initPos(2, 8, kDirBottomRight); @@ -2190,7 +2186,7 @@ void Scene26::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 25; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS26ExitOutsideCircusWorld].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS26ExitOutsideCircusWorld].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS26LeaveScene; } break; @@ -2199,7 +2195,7 @@ void Scene26::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 27; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS26ExitOutsideClown].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS26ExitOutsideClown].y), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS26LeaveScene; } break; @@ -2208,7 +2204,7 @@ void Scene26::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 29; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS26ExitArcade].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS26ExitArcade].y), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS26LeaveScene; } break; @@ -2217,7 +2213,7 @@ void Scene26::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 30; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS26ExitElephant].y), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS26LeaveScene; } break; @@ -2226,7 +2222,7 @@ void Scene26::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 31; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS26ExitBeerStand].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS26ExitBeerStand].y), 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS26LeaveScene; } break; @@ -2234,12 +2230,12 @@ void Scene26::run() { case kHS26WalkArea1: case kHS26WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2354,21 +2350,21 @@ void Scene27::run() { _vm->_gnap->initPos(7, 12, kDirBottomRight); _vm->_plat->initPos(6, 12, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(7, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(7, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); break; case 29: _vm->_gnap->initPos(-1, 8, kDirBottomRight); _vm->_plat->initPos(-1, 9, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(3, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(3, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(3, 9, -1, 0x107C2, 1); break; case 31: _vm->_gnap->initPos(12, 8, kDirBottomLeft); _vm->_plat->initPos(12, 9, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(8, 9, -1, 0x107C2, 1); break; default: @@ -2424,7 +2420,7 @@ void Scene27::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemPicture) { _vm->_gnap->_idleFacing = kDirUpLeft; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27Janitor].x, _vm->_hotspotsWalkPos[kHS27Janitor].y, 0, 0x107BC, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27Janitor], 0, 0x107BC, 1)) _vm->_gnap->_actionStatus = kAS27ShowPictureToJanitor; } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS27Janitor].x, _vm->_hotspotsWalkPos[kHS27Janitor].y, 7, 3); @@ -2435,7 +2431,7 @@ void Scene27::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27Janitor].x, _vm->_hotspotsWalkPos[kHS27Janitor].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27Janitor], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS27TalkJanitor; break; case GRAB_CURSOR: @@ -2474,7 +2470,7 @@ void Scene27::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 26; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS27ExitCircus].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS27ExitCircus].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS27LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS27ExitCircus].x + 1, _vm->_hotspotsWalkPos[kHS27ExitCircus].y, -1, 0x107C7, 1); } @@ -2484,7 +2480,7 @@ void Scene27::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 29; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS27ExitArcade].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS27ExitArcade].y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS27LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS27ExitArcade].x, _vm->_hotspotsWalkPos[kHS27ExitArcade].y + 1, -1, 0x107CF, 1); } @@ -2494,7 +2490,7 @@ void Scene27::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 31; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS27ExitBeerStand].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS27ExitBeerStand].y), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS27LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS27ExitBeerStand].x, _vm->_hotspotsWalkPos[kHS27ExitBeerStand].y + 1, -1, 0x107CD, 1); } @@ -2505,12 +2501,12 @@ void Scene27::run() { if (_vm->isFlag(kGFPlatypus)) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 28; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27ExitClown].x, _vm->_hotspotsWalkPos[kHS27ExitClown].y, 0, 0x107AD, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27ExitClown], 0, 0x107AD, 1); _vm->_gnap->_actionStatus = kAS27LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS27ExitClown].x + 1, _vm->_hotspotsWalkPos[kHS27ExitClown].y, -1, 0x107C4, 1); } else { _vm->_hotspots[kHS27WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS27ExitClown].x, 7, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS27ExitClown].x, 7), 0, 0x107BC, 1); _vm->_hotspots[kHS27WalkArea1]._flags &= SF_WALKABLE; _vm->_gnap->_actionStatus = kAS27TryEnterClownTent; } @@ -2519,12 +2515,12 @@ void Scene27::run() { case kHS27WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -2618,7 +2614,7 @@ void Scene27::updateAnimations() { break; case kAS27TryEnterClownTentDone: _vm->_hotspots[kHS27WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, 9, -1, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[7].x, 9), -1, 0x107BC, 1); _vm->_hotspots[kHS27WalkArea1]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = -1; break; @@ -2808,9 +2804,9 @@ void Scene28::run() { } } else { _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(2, 8, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(2, 8), 0, 0x107BB, 1); _vm->_hotspots[kHS28WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Horn].x, _vm->_hotspotsWalkPos[kHS28Horn].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Horn], 0, 0x107BB, 1); _vm->_hotspots[kHS28WalkArea1]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS28GrabHornFails; } @@ -2833,13 +2829,13 @@ void Scene28::run() { _vm->playGnapImpossible(0, 0); } else if (_vm->_grabCursorSpriteIndex == kItemBucketWithBeer) { _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Clown].x, _vm->_hotspotsWalkPos[kHS28Clown].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1); _vm->playGnapPullOutDevice(0, 0); _vm->playGnapUseDevice(0, 0); _vm->_gnap->_actionStatus = kAS28UseBeerBucketWithClown; } else if (_vm->_grabCursorSpriteIndex == kItemBucketWithPill) { _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Clown].x, _vm->_hotspotsWalkPos[kHS28Clown].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1); _vm->playGnapPullOutDevice(0, 0); _vm->playGnapUseDevice(0, 0); _vm->_gnap->_actionStatus = kAS28UsePillBucketWithClown; @@ -2852,7 +2848,7 @@ void Scene28::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(5, 8, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(5, 8), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS28TalkClown; break; case GRAB_CURSOR: @@ -2869,7 +2865,7 @@ void Scene28::run() { _vm->_isLeavingScene = true; _vm->_newSceneNum = 27; _vm->_hotspots[kHS28WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28ExitOutsideClown].x, _vm->_hotspotsWalkPos[kHS28ExitOutsideClown].y, 0, 0x107BF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS28ExitOutsideClown], 0, 0x107BF, 1); _vm->_gnap->_actionStatus = kAS28LeaveScene; _vm->_hotspots[kHS28WalkArea1]._flags &= ~SF_WALKABLE; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS28ExitOutsideClown].x - 1, _vm->_hotspotsWalkPos[kHS28ExitOutsideClown].y, -1, 0x107C2, 1); @@ -2903,12 +2899,12 @@ void Scene28::run() { case kHS28WalkArea1: case kHS28WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -3007,7 +3003,7 @@ void Scene28::updateAnimations() { _currClownSequenceId = 0x11B; _nextClownSequenceId = -1; _vm->_gnap->_actionStatus = -1; - _vm->gnapWalkTo(2, 8, -1, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107BB, 1); break; case kAS28TalkClown: _clownTalkCtr = (_clownTalkCtr + 1) % 2; @@ -3131,13 +3127,13 @@ void Scene29::run() { _vm->_gnap->initPos(12, 7, kDirBottomRight); _vm->_plat->initPos(12, 8, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(8, 7), -1, 0x107B9, 1); _vm->platypusWalkTo(8, 8, -1, 0x107C2, 1); } else { _vm->_gnap->initPos(-1, 7, kDirBottomRight); _vm->_plat->initPos(-2, 7, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 7), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 7, -1, 0x107C2, 1); } @@ -3186,7 +3182,7 @@ void Scene29::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemBanana) { _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29Monkey], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS29UseBananaWithMonkey; _vm->_newSceneNum = 51; _vm->_isLeavingScene = true; @@ -3214,7 +3210,7 @@ void Scene29::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 26; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29ExitCircus].x, _vm->_hotspotsWalkPos[kHS29ExitCircus].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29ExitCircus], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS29LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS29ExitCircus].x + 1, _vm->_hotspotsWalkPos[kHS29ExitCircus].y, -1, -1, 1); } @@ -3224,7 +3220,7 @@ void Scene29::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 27; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29ExitOutsideClown].x, _vm->_hotspotsWalkPos[kHS29ExitOutsideClown].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29ExitOutsideClown], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS29LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS29ExitOutsideClown].x, _vm->_hotspotsWalkPos[kHS29ExitOutsideClown].y - 1, -1, 0x107CD, 1); } @@ -3236,7 +3232,7 @@ void Scene29::run() { _vm->setGrabCursorSprite(-1); _vm->_isLeavingScene = true; _vm->_newSceneNum = 52; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y, 0, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS29Aracde], 0, -1, 1); _vm->playGnapIdle(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y); _vm->_gnap->_actionStatus = kAS29LeaveScene; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -3258,12 +3254,12 @@ void Scene29::run() { case kHS29WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp index c89d954906..be8b9113fc 100644 --- a/engines/gnap/scenes/group3.cpp +++ b/engines/gnap/scenes/group3.cpp @@ -67,7 +67,7 @@ void Scene30::run() { _vm->_gnap->initPos(7, 12, kDirBottomRight); _vm->_plat->initPos(6, 12, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(7, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(7, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); while (!_vm->_sceneDone) { @@ -115,7 +115,7 @@ void Scene30::run() { if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole && !_vm->isFlag(kGFUnk23)) { _vm->_hotspots[kHS30WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS30PillMachine].x, _vm->_hotspotsWalkPos[kHS30PillMachine].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS30PillMachine], 0, 0x107BC, 1); _vm->_hotspots[kHS30WalkArea1]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS30UsePillMachine; hasTakenPill = true; @@ -124,7 +124,7 @@ void Scene30::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(9, 8, 0, 0x107BC, 1); + _vm->gnapWalkTo(Common::Point(9, 8), 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS30LookPillMachine; break; case GRAB_CURSOR: @@ -146,7 +146,7 @@ void Scene30::run() { _vm->_newSceneNum = 47; else _vm->_newSceneNum = 26; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS30ExitCircus].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS30ExitCircus].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS30LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS30ExitCircus].x + 1, _vm->_hotspotsWalkPos[kHS30ExitCircus].y, -1, 0x107C2, 1); } @@ -154,12 +154,12 @@ void Scene30::run() { case kHS30WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -254,7 +254,7 @@ void Scene30::updateAnimations() { break; case kAS30UsePillMachine4: gameSys.insertSequence(0x106, 1, 0, 0, kSeqNone, 0, 0, 0); - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS30PillMachine].x, _vm->_hotspotsWalkPos[kHS30PillMachine].y + 1, -1, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS30PillMachine] + Common::Point(0, 1), -1, 0x107BC, 1); _vm->_gnap->_actionStatus = -1; break; case kAS30LookPillMachine: @@ -315,13 +315,13 @@ void Scene31::run() { _vm->_gnap->initPos(-1, 8, kDirBottomLeft); _vm->_plat->initPos(-1, 9, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(3, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(3, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(3, 9, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(7, 12, kDirBottomRight); _vm->_plat->initPos(6, 12, kDirNone); _vm->endSceneInit(); - _vm->gnapWalkTo(7, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(7, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 8, -1, 0x107D2, 1); } @@ -381,9 +381,9 @@ void Scene31::run() { _vm->playGnapScratchingHead(2, 2); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, -1, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown] + Common::Point(0, 1), -1, -1, 1); _vm->_hotspots[kHS31WalkArea1]._flags |= SF_WALKABLE; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y, 0, 0x107B9, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown], 0, 0x107B9, 1); _vm->_hotspots[kHS31WalkArea1]._flags &= ~SF_WALKABLE; _vm->_gnap->_actionStatus = kAS31UseMeasuringClown; _vm->_timers[4] = 300; @@ -418,7 +418,7 @@ void Scene31::run() { gameSys.insertSequence(0xF8, 59, 0, 0, kSeqNone, 0, 0, 0); _vm->playGnapPullOutDevice(6, 8); _vm->playGnapUseDevice(0, 0); - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS31FillEmptyBucketWithBeer; _vm->_timers[4] = 300; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -432,7 +432,7 @@ void Scene31::run() { if (_beerGuyDistracted) { _vm->playGnapScratchingHead(6, 2); } else { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS31UseBeerBarrel; _vm->_gnap->_idleFacing = kDirUpLeft; } @@ -450,7 +450,7 @@ void Scene31::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 26; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS31ExitCircus].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS31ExitCircus].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS31LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS31ExitCircus].x + 1, _vm->_hotspotsWalkPos[kHS31ExitCircus].y, -1, -1, 1); } @@ -460,7 +460,7 @@ void Scene31::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->_newSceneNum = 27; - _vm->gnapWalkTo(-1, _vm->_hotspotsWalkPos[kHS31ExitOutsideClown].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(-1, _vm->_hotspotsWalkPos[kHS31ExitOutsideClown].y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS31LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS31ExitOutsideClown].x, _vm->_hotspotsWalkPos[kHS31ExitOutsideClown].y + 1, -1, 0x107CF, 1); } @@ -468,12 +468,12 @@ void Scene31::run() { case kHS31WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -668,7 +668,7 @@ void Scene32::run() { _vm->_plat->initPos(12, 6, kDirUnk4); _vm->endSceneInit(); _vm->platypusWalkTo(9, 6, -1, 0x107D2, 1); - _vm->gnapWalkTo(8, 6, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 6), -1, 0x107BA, 1); } else { _vm->_gnap->initPos(1, 6, kDirBottomRight); _vm->_plat->initPos(1, 7, kDirNone); @@ -719,7 +719,7 @@ void Scene32::run() { if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; _vm->setGrabCursorSprite(-1); - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS32ExitTruck].x, _vm->_hotspotsWalkPos[kHS32ExitTruck].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS32ExitTruck], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS32LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS32ExitTruck].x, _vm->_hotspotsWalkPos[kHS32ExitTruck].y + 1, -1, 0x107CD, 1); _vm->_newSceneNum = 33; @@ -735,13 +735,13 @@ void Scene32::run() { case kHS32WalkArea7: case kHS32WalkArea8: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = 0; } @@ -829,7 +829,7 @@ void Scene33::run() { _vm->_gnap->initPos(11, 7, kDirBottomLeft); _vm->_plat->initPos(12, 7, kDirUnk4); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 7, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 7), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 7, -1, 0x107D2, 1); break; case 37: @@ -842,7 +842,7 @@ void Scene33::run() { _vm->_plat->initPos(-1, 7, kDirNone); _vm->endSceneInit(); _vm->platypusWalkTo(2, 7, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); break; default: _vm->_gnap->initPos(3, 7, kDirBottomRight); @@ -899,14 +899,14 @@ void Scene33::run() { switch (_vm->_verbCursor) { case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33Chicken].x, _vm->_hotspotsWalkPos[kHS33Chicken].y, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) + if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1)) _vm->_gnap->_actionStatus = kAS33UseChicken; else _vm->_gnap->_actionStatus = -1; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirBottomRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33Chicken].x, _vm->_hotspotsWalkPos[kHS33Chicken].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33Chicken], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS33TalkChicken; break; case LOOK_CURSOR: @@ -926,7 +926,7 @@ void Scene33::run() { if (_vm->_gnap->_pos.x > 6) _vm->gnapWalkTo(_vm->_gnap->_pos, 0, 0x107AD, 1); else - _vm->gnapWalkTo(6, 7, 0, 0x107B1, 1); + _vm->gnapWalkTo(Common::Point(6, 7), 0, 0x107B1, 1); } break; @@ -938,14 +938,14 @@ void Scene33::run() { if (_vm->_gnap->_pos.x > 7) _vm->gnapWalkTo(_vm->_gnap->_pos, 0, 0x107AD, 1); else - _vm->gnapWalkTo(7, 7, 0, 0x107B1, 1); + _vm->gnapWalkTo(Common::Point(7, 7), 0, 0x107B1, 1); } break; case kHS33ExitCreek: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33ExitCreek].x, _vm->_hotspotsWalkPos[kHS33ExitCreek].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33ExitCreek], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS33LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS33ExitCreek].x, _vm->_hotspotsWalkPos[kHS33ExitCreek].y, -1, 0x107CD, 1); _vm->_newSceneNum = 34; @@ -955,7 +955,7 @@ void Scene33::run() { case kHS33ExitPigpen: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33ExitPigpen].x, _vm->_hotspotsWalkPos[kHS33ExitPigpen].y, 0, 0x107AF, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS33ExitPigpen], 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS33LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS33ExitPigpen].x, _vm->_hotspotsWalkPos[kHS33ExitPigpen].y, -1, 0x107CF, 1); _vm->_newSceneNum = 32; @@ -965,12 +965,12 @@ void Scene33::run() { case kHS33WalkArea1: case kHS33WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1172,7 +1172,7 @@ void Scene38::run() { _vm->_gnap->_actionStatus = kAS38ReleaseHuntingTrophy; } else { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(-1, -1, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS38LeaveScene; _vm->_newSceneNum = 37; } @@ -1186,7 +1186,7 @@ void Scene38::run() { } else if (_vm->_plat->_actionStatus == kAS38PlatypusHoldingTrapDoor) { _vm->_sceneWaiting = false; _vm->_isLeavingScene = true; - _vm->gnapWalkTo(5, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(5, 7), 0, 0x107BB, 1); _vm->_newSceneNum = 39; _vm->_gnap->_actionStatus = kAS38ExitCave; } @@ -1215,7 +1215,7 @@ void Scene38::run() { if (_vm->_plat->_actionStatus == kAS38PlatypusHoldingTrapDoor) _vm->playGnapImpossible(0, 0); else { - _vm->gnapWalkTo(3, 6, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(3, 6), 0, 0x107BB, 1); _vm->platypusWalkTo(4, 8, -1, -1, 1); _vm->_gnap->_actionStatus = kAS38UseHuntingTrophy; } @@ -1243,7 +1243,7 @@ void Scene38::run() { if (_vm->_gnap->_actionStatus == kAS38HoldingHuntingTrophy) _vm->_gnap->_actionStatus = kAS38ReleaseHuntingTrophy; else if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: @@ -1251,7 +1251,7 @@ void Scene38::run() { if (_vm->_gnap->_actionStatus == kAS38HoldingHuntingTrophy) _vm->_gnap->_actionStatus = kAS38ReleaseHuntingTrophy; else if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; @@ -1327,7 +1327,7 @@ void Scene38::updateAnimations() { _vm->_gnap->_idleFacing = kDirBottomRight; if (_vm->_isLeavingScene) { _vm->_sceneWaiting = false; - _vm->gnapWalkTo(5, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(5, 7), 0, 0x107BB, 1); _vm->_newSceneNum = 39; _vm->_gnap->_actionStatus = kAS38ExitCave; } else { @@ -1491,7 +1491,7 @@ void Scene39::run() { } else { switch (_vm->_verbCursor) { case LOOK_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS39Sign].x, _vm->_hotspotsWalkPos[kHS39Sign].y, 0, -1, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS39Sign], 0, -1, 1); _vm->playGnapIdle(_vm->_hotspotsWalkPos[kHS39Sign].x, _vm->_hotspotsWalkPos[kHS39Sign].y); _vm->showFullScreenSprite(0x1C); break; @@ -1516,12 +1516,12 @@ void Scene39::run() { case kHS39WalkArea1: case kHS39WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; default: if (_vm->_mouseClickState._left && _vm->_gnap->_actionStatus < 0) { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); _vm->_mouseClickState._left = false; } break; diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index e5e56510b3..f6f41e6be5 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -277,12 +277,12 @@ void Scene41::run() { _vm->_plat->initPos(-2, 8, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); } else if (_vm->_prevSceneNum == 42) { _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(11, 9, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(5, 8, kDirBottomRight); @@ -374,14 +374,14 @@ void Scene41::run() { case kHS41ExitCave: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41ExitCave].x, _vm->_hotspotsWalkPos[kHS41ExitCave].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41ExitCave], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS41LeaveScene; _vm->_newSceneNum = 40; break; case kHS41Exit: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41Exit].x, -1, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS41Exit].x, -1), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS41LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS41Exit].x, -1, -1, 0x107CF, 1); _vm->_newSceneNum = 45; @@ -389,7 +389,7 @@ void Scene41::run() { case kHS41ExitBBQ: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS41ExitBBQ].x, -1, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS41ExitBBQ].x, -1), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS41LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS41ExitBBQ].x, -1, -1, 0x107CD, 1); _vm->_newSceneNum = 42; @@ -398,7 +398,7 @@ void Scene41::run() { case kHS41ToyVendor: if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { _vm->_gnap->_actionStatus = kAS41UseQuarterWithToyVendor; - _vm->gnapWalkTo(4, 7, 0, 0x107BB, 9); + _vm->gnapWalkTo(Common::Point(4, 7), 0, 0x107BB, 9); _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 5, 0); } else if (_vm->_grabCursorSpriteIndex >= 0) { _vm->playGnapShowCurrItem(4, 7, 5, 0); @@ -412,7 +412,7 @@ void Scene41::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(4, 7, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(4, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS41TalkToyVendor; break; case PLAT_CURSOR: @@ -424,7 +424,7 @@ void Scene41::run() { case kHS41Kid: if (_vm->_grabCursorSpriteIndex == kItemChickenBucket) { - _vm->gnapWalkTo(7, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(7, 7), 0, 0x107BB, 1); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS41UseChickenBucketWithKid; } else if (_vm->_grabCursorSpriteIndex >= 0) { @@ -435,13 +435,13 @@ void Scene41::run() { _vm->playGnapScratchingHead(9, 0); break; case GRAB_CURSOR: - _vm->gnapWalkTo(7, 7, 0, 0x107BB, 1); + _vm->gnapWalkTo(Common::Point(7, 7), 0, 0x107BB, 1); _vm->_gnap->_idleFacing = kDirUpRight; _vm->_gnap->_actionStatus = kAS41GrabKid; break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(7, 7, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(7, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); break; case PLAT_CURSOR: _vm->playGnapImpossible(0, 0); @@ -460,7 +460,7 @@ void Scene41::run() { case kHS41WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } } @@ -503,7 +503,7 @@ void Scene41::run() { _vm->_toyUfoActionStatus = kAS41ToyUfoRefresh; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 2); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } @@ -788,19 +788,19 @@ void Scene42::run() { _vm->_gnap->initPos(-1, 8, kDirUpRight); _vm->_plat->initPos(-1, 9, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); } else if (_vm->_prevSceneNum == 43) { _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(11, 9, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(5, 11, kDirUpRight); _vm->_plat->initPos(6, 11, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); } @@ -886,7 +886,7 @@ void Scene42::run() { case kHS42ExitUfoParty: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS42ExitUfoParty].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS42ExitUfoParty].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = kAS42LeaveScene; _vm->platypusWalkTo(_vm->_plat->_pos.x, _vm->_hotspotsWalkPos[kHS42ExitUfoParty].y, -1, 0x107C7, 1); _vm->_newSceneNum = 40; @@ -894,7 +894,7 @@ void Scene42::run() { case kHS42ExitToyStand: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42ExitToyStand].x, _vm->_gnap->_pos.y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS42ExitToyStand].x, _vm->_gnap->_pos.y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = kAS42LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS42ExitToyStand].x, _vm->_hotspotsWalkPos[kHS42ExitToyStand].y, -1, 0x107CF, 1); _vm->_newSceneNum = 41; @@ -902,7 +902,7 @@ void Scene42::run() { case kHS42ExitUfo: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42ExitUfo].x, _vm->_gnap->_pos.y, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS42ExitUfo].x, _vm->_gnap->_pos.y), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = kAS42LeaveScene; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS42ExitUfo].x, _vm->_hotspotsWalkPos[kHS42ExitUfo].y, -1, 0x107CD, 1); _vm->_newSceneNum = 43; @@ -910,7 +910,7 @@ void Scene42::run() { case kHS42BBQVendor: if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor].x, _vm->_hotspotsWalkPos[kHS42BBQVendor].y, 0, 0x107BB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor], 0, 0x107BB, 1); _vm->_gnap->_actionStatus = kAS42UseQuarterWithBBQVendor; if (_vm->_plat->_pos.y < 9) _vm->platypusWalkTo(_vm->_plat->_pos.x, 9, -1, -1, 1); @@ -923,7 +923,7 @@ void Scene42::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor].x, _vm->_hotspotsWalkPos[kHS42BBQVendor].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42BBQVendor], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = kAS42TalkBBQVendor; break; case GRAB_CURSOR: @@ -943,7 +943,7 @@ void Scene42::run() { _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0); break; case GRAB_CURSOR: - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x, _vm->_hotspotsWalkPos[kHS42ChickenLeg].y, 0, 0x107BC, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS42ChickenLeg], 0, 0x107BC, 1); _vm->_gnap->_actionStatus = kAS42GrabChickenLeg; break; case TALK_CURSOR: @@ -957,7 +957,7 @@ void Scene42::run() { case kHS42WalkArea1: case kHS42WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } @@ -969,7 +969,7 @@ void Scene42::run() { _vm->_toyUfoActionStatus = kAS42ToyUfoRefresh; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } @@ -1230,14 +1230,14 @@ void Scene43::run() { _vm->_gnap->initPos(-1, 8, kDirUpRight); _vm->_plat->initPos(-1, 9, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); break; case 44: _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(11, 9, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1); break; case 54: @@ -1250,7 +1250,7 @@ void Scene43::run() { _vm->_gnap->initPos(5, 11, kDirUpRight); _vm->_plat->initPos(6, 11, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); break; } @@ -1344,7 +1344,7 @@ void Scene43::run() { case kHS43ExitUfoParty: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS43ExitUfoParty].x, _vm->_hotspotsWalkPos[kHS43ExitUfoParty].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS43ExitUfoParty], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS43ExitUfoParty].x, _vm->_hotspotsWalkPos[kHS43ExitUfoParty].y, -1, 0x107C7, 1); _vm->_newSceneNum = 40; @@ -1352,7 +1352,7 @@ void Scene43::run() { case kHS43ExitBBQ: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS43ExitBBQ].x, _vm->_gnap->_pos.y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS43ExitBBQ].x, _vm->_gnap->_pos.y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS43ExitBBQ].x, _vm->_hotspotsWalkPos[kHS43ExitBBQ].y, -1, 0x107CF, 1); _vm->_newSceneNum = 42; @@ -1360,7 +1360,7 @@ void Scene43::run() { case kHS43ExitKissinBooth: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS43ExitKissinBooth].x, _vm->_gnap->_pos.y, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS43ExitKissinBooth].x, _vm->_gnap->_pos.y), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS43ExitKissinBooth].x, _vm->_hotspotsWalkPos[kHS43ExitKissinBooth].y, -1, 0x107CD, 1); _vm->_newSceneNum = 44; @@ -1376,7 +1376,7 @@ void Scene43::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(5, 8, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(Common::Point(5, 8), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = 2; break; case GRAB_CURSOR: @@ -1398,7 +1398,7 @@ void Scene43::run() { break; case GRAB_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(3, 7, 0, 67515, 1); + _vm->gnapWalkTo(Common::Point(3, 7), 0, 67515, 1); _vm->_gnap->_actionStatus = 1; break; case TALK_CURSOR: @@ -1412,7 +1412,7 @@ void Scene43::run() { case kHS43WalkArea1: case kHS43WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } } @@ -1423,7 +1423,7 @@ void Scene43::run() { _vm->_toyUfoActionStatus = 5; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } @@ -1684,14 +1684,14 @@ void Scene44::run() { _vm->_gnap->initPos(-1, 8, kDirUpRight); _vm->_plat->initPos(-1, 7, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); break; case 46: _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(11, 8, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(6, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(6, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(7, 8, -1, 0x107D2, 1); break; case 50: @@ -1715,7 +1715,7 @@ void Scene44::run() { _vm->_plat->initPos(6, 11, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(5, 8), -1, 0x107BA, 1); break; } } @@ -1792,14 +1792,14 @@ void Scene44::run() { case kHS44ExitUfoParty: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfoParty].x, _vm->_hotspotsWalkPos[kHS44ExitUfoParty].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfoParty], 0, 0x107AE, 1); _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 40; break; case kHS44ExitUfo: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfo].x, _vm->_gnap->_pos.y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS44ExitUfo].x, _vm->_gnap->_pos.y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS44ExitUfo].x, _vm->_plat->_pos.y, -1, 0x107CF, 1); _vm->_newSceneNum = 43; @@ -1807,7 +1807,7 @@ void Scene44::run() { case kHS44ExitShow: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitShow].x, _vm->_hotspotsWalkPos[kHS44ExitShow].y, 0, 0x107AB, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44ExitShow], 0, 0x107AB, 1); _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 46; break; @@ -1815,7 +1815,7 @@ void Scene44::run() { case kHS44KissingLady: if (_vm->_grabCursorSpriteIndex >= 0) { _vm->_gnap->_actionStatus = 2; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44KissingLady].x, _vm->_hotspotsWalkPos[kHS44KissingLady].y, 0, -1, 9); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44KissingLady], 0, -1, 9); _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, _vm->_hotspotsWalkPos[kHS44KissingLady].x - 1, _vm->_hotspotsWalkPos[kHS44KissingLady].y); } else { switch (_vm->_verbCursor) { @@ -1827,7 +1827,7 @@ void Scene44::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44KissingLady].x, _vm->_hotspotsWalkPos[kHS44KissingLady].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44KissingLady], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = 1; break; case PLAT_CURSOR: @@ -1881,7 +1881,7 @@ void Scene44::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44SpringGuy].x, _vm->_hotspotsWalkPos[kHS44SpringGuy].y, -1, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS44SpringGuy], -1, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); break; case GRAB_CURSOR: case PLAT_CURSOR: @@ -1894,7 +1894,7 @@ void Scene44::run() { case kHS44WalkArea1: case kHS44WalkArea2: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } @@ -1906,7 +1906,7 @@ void Scene44::run() { _vm->_toyUfoActionStatus = 7; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } @@ -2154,19 +2154,19 @@ void Scene45::run() { _vm->_plat->initPos(-1, 9, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(4, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 7), -1, 0x107B9, 1); } else if (_vm->_prevSceneNum == 41) { _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(11, 9, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(4, 8, -1, 0x107D2, 1); - _vm->gnapWalkTo(10, 9, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(10, 9), -1, 0x107BA, 1); } else { _vm->_gnap->initPos(2, 11, kDirUpRight); _vm->_plat->initPos(6, 11, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(4, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 7, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 7), -1, 0x107B9, 1); } if (!_vm->isFlag(kGFUnk21) && !_vm->isFlag(kGFGnapControlsToyUFO)) { @@ -2284,7 +2284,7 @@ void Scene45::run() { case kHS45ExitUfoParty: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS45ExitUfoParty].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS45ExitUfoParty].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 40; } @@ -2293,7 +2293,7 @@ void Scene45::run() { case kHS45ExitShoe: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS45ExitShoe].x, _vm->_gnap->_pos.y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS45ExitShoe].x, _vm->_gnap->_pos.y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS45ExitShoe].x, _vm->_plat->_pos.y, -1, 0x107CF, 1); _vm->_newSceneNum = 46; @@ -2303,7 +2303,7 @@ void Scene45::run() { case kHS45ExitRight: if (_vm->_gnap->_actionStatus < 0) { _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS45ExitRight].x, _vm->_gnap->_pos.y, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS45ExitRight].x, _vm->_gnap->_pos.y), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS45ExitRight].x, _vm->_plat->_pos.y, -1, 0x107CD, 1); _vm->_newSceneNum = 41; @@ -2320,7 +2320,7 @@ void Scene45::run() { case kHS45DiscoBall: if (_vm->_gnap->_actionStatus < 0) { if (_vm->_grabCursorSpriteIndex == kItemSpring) { - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS45DiscoBall].x, _vm->_hotspotsWalkPos[kHS45DiscoBall].y, 0, 0x9F, 5); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS45DiscoBall], 0, 0x9F, 5); _vm->_gnap->_actionStatus = 1; _vm->setGrabCursorSprite(-1); _vm->invRemove(kItemSpring); @@ -2343,7 +2343,7 @@ void Scene45::run() { case kHS45WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } } @@ -2354,7 +2354,7 @@ void Scene45::run() { _vm->_toyUfoActionStatus = 3; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 5); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } @@ -2518,19 +2518,19 @@ void Scene46::run() { _vm->_plat->initPos(-1, 8, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1); + _vm->gnapWalkTo(Common::Point(2, 8), -1, 0x107B9, 1); } else if (_vm->_prevSceneNum == 45) { _vm->_gnap->initPos(11, 8, kDirUpRight); _vm->_plat->initPos(12, 8, kDirUpLeft); _vm->endSceneInit(); - _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(8, 8), -1, 0x107BA, 1); _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1); } else { _vm->_gnap->initPos(5, 11, kDirUpRight); _vm->_plat->initPos(6, 11, kDirUpLeft); _vm->endSceneInit(); _vm->platypusWalkTo(5, 8, -1, 0x107C2, 1); - _vm->gnapWalkTo(6, 8, -1, 0x107BA, 1); + _vm->gnapWalkTo(Common::Point(6, 8), -1, 0x107BA, 1); } _vm->_timers[4] = _vm->getRandom(50) + 80; @@ -2614,7 +2614,7 @@ void Scene46::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpLeft; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46SackGuy].x, _vm->_hotspotsWalkPos[kHS46SackGuy].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46SackGuy], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = 2; break; case GRAB_CURSOR: @@ -2635,7 +2635,7 @@ void Scene46::run() { break; case TALK_CURSOR: _vm->_gnap->_idleFacing = kDirUpRight; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x, _vm->_hotspotsWalkPos[kHS46ItchyGuy].y, 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); + _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46ItchyGuy], 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1); _vm->_gnap->_actionStatus = 1; break; case GRAB_CURSOR: @@ -2648,14 +2648,14 @@ void Scene46::run() { case kHS46ExitUfoParty: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS46ExitUfoParty].y, 0, 0x107AE, 1); + _vm->gnapWalkTo(Common::Point(_vm->_gnap->_pos.x, _vm->_hotspotsWalkPos[kHS46ExitUfoParty].y), 0, 0x107AE, 1); _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 40; break; case kHS46ExitKissinBooth: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46ExitKissinBooth].x, _vm->_gnap->_pos.y, 0, 0x107AF, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS46ExitKissinBooth].x, _vm->_gnap->_pos.y), 0, 0x107AF, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS46ExitKissinBooth].x, _vm->_plat->_pos.y, -1, 0x107CF, 1); _vm->_newSceneNum = 44; @@ -2663,7 +2663,7 @@ void Scene46::run() { case kHS46ExitDisco: _vm->_isLeavingScene = true; - _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHS46ExitDisco].x, _vm->_gnap->_pos.y, 0, 0x107AB, 1); + _vm->gnapWalkTo(Common::Point(_vm->_hotspotsWalkPos[kHS46ExitDisco].x, _vm->_gnap->_pos.y), 0, 0x107AB, 1); _vm->_gnap->_actionStatus = 0; _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHS46ExitDisco].x, _vm->_plat->_pos.y, -1, 0x107CD, 1); _vm->_newSceneNum = 45; @@ -2671,7 +2671,7 @@ void Scene46::run() { case kHS46WalkArea1: if (_vm->_gnap->_actionStatus < 0) - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); break; } } @@ -2682,7 +2682,7 @@ void Scene46::run() { _vm->_toyUfoActionStatus = 4; _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 2); } else { - _vm->gnapWalkTo(-1, -1, -1, -1, 1); + _vm->gnapWalkTo(Common::Point(-1, -1), -1, -1, 1); } } -- cgit v1.2.3