aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-05-08 19:44:22 +0200
committerEugene Sandulenko2016-05-10 12:14:56 +0200
commita67a9923a928965feb33e86b2c9cb0f18af25ae5 (patch)
tree8e056ddcfa58227dd1a9913a2e510e9a248985ce
parentb605baef85cab9d562d541a4b14e8fbf564a8267 (diff)
downloadscummvm-rg350-a67a9923a928965feb33e86b2c9cb0f18af25ae5.tar.gz
scummvm-rg350-a67a9923a928965feb33e86b2c9cb0f18af25ae5.tar.bz2
scummvm-rg350-a67a9923a928965feb33e86b2c9cb0f18af25ae5.zip
GNAP: Refactoring of playBrainPulsating, playIdle and playImpossible
Diffstat
-rw-r--r--engines/gnap/character.cpp12
-rw-r--r--engines/gnap/character.h6
-rw-r--r--engines/gnap/scenes/group0.cpp122
-rw-r--r--engines/gnap/scenes/group1.cpp118
-rw-r--r--engines/gnap/scenes/group2.cpp114
-rw-r--r--engines/gnap/scenes/group2.h2
-rw-r--r--engines/gnap/scenes/group3.cpp60
-rw-r--r--engines/gnap/scenes/group4.cpp72
8 files changed, 253 insertions, 253 deletions
diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 094691300f..32f3946668 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -1057,8 +1057,8 @@ void PlayerGnap::actionIdle(int sequenceId) {
}
}
-void PlayerGnap::playImpossible(int gridX, int gridY) {
- playSequence(getSequenceId(gskImpossible, Common::Point(gridX, gridY)) | 0x10000);
+void PlayerGnap::playImpossible(Common::Point gridPos) {
+ playSequence(getSequenceId(gskImpossible, gridPos) | 0x10000);
}
void PlayerGnap::playScratchingHead(int gridX, int gridY) {
@@ -1073,8 +1073,8 @@ void PlayerGnap::playMoan2(int gridX, int gridY) {
playSequence(getSequenceId(gskMoan2, Common::Point(gridX, gridY)) | 0x10000);
}
-void PlayerGnap::playBrainPulsating(int gridX, int gridY) {
- playSequence(getSequenceId(gskBrainPulsating, Common::Point(gridX, gridY)) | 0x10000);
+void PlayerGnap::playBrainPulsating(Common::Point gridPos) {
+ playSequence(getSequenceId(gskBrainPulsating, gridPos) | 0x10000);
}
void PlayerGnap::playPullOutDevice(int gridX, int gridY) {
@@ -1089,8 +1089,8 @@ void PlayerGnap::playUseDevice(int gridX, int gridY) {
playSequence(getSequenceId(gskUseDevice, Common::Point(gridX, gridY)) | 0x10000);
}
-void PlayerGnap::playIdle(int gridX, int gridY) {
- playSequence(getSequenceId(gskIdle, Common::Point(gridX, gridY)) | 0x10000);
+void PlayerGnap::playIdle(Common::Point gridPos) {
+ playSequence(getSequenceId(gskIdle, gridPos) | 0x10000);
}
void PlayerGnap::playShowItem(int itemIndex, int gridLookX, int gridLookY) {
diff --git a/engines/gnap/character.h b/engines/gnap/character.h
index f1fc0ec3db..a1fb6cfc24 100644
--- a/engines/gnap/character.h
+++ b/engines/gnap/character.h
@@ -96,9 +96,9 @@ public:
void idle();
void initBrainPulseRndValue();
void kissPlatypus(int callback);
- void playBrainPulsating(int gridX, int gridY);
- void playIdle(int gridX, int gridY);
- void playImpossible(int gridX, int gridY);
+ void playBrainPulsating(Common::Point gridPos = Common::Point(0, 0));
+ void playIdle(Common::Point gridPos = Common::Point(0, 0));
+ void playImpossible(Common::Point gridPos = Common::Point(0, 0));
void playMoan1(int gridX, int gridY);
void playMoan2(int gridX, int gridY);
void playPullOutDevice(int gridX, int gridY);
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index 972bbfa907..b282751b3d 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -128,7 +128,7 @@ void Scene01::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -141,11 +141,11 @@ void Scene01::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -166,7 +166,7 @@ void Scene01::run() {
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -188,7 +188,7 @@ void Scene01::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -217,7 +217,7 @@ void Scene01::run() {
gnap._actionStatus = kAS01LookPigs;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -481,7 +481,7 @@ void Scene02::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -494,11 +494,11 @@ void Scene02::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -532,7 +532,7 @@ void Scene02::run() {
gnap._actionStatus = kAS02TalkChicken;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -579,7 +579,7 @@ void Scene02::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -602,7 +602,7 @@ void Scene02::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -949,7 +949,7 @@ void Scene03::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -962,11 +962,11 @@ void Scene03::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -993,7 +993,7 @@ void Scene03::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1019,7 +1019,7 @@ void Scene03::run() {
case kHS03Creek:
if (gnap._actionStatus == -1) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1035,7 +1035,7 @@ void Scene03::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1067,7 +1067,7 @@ void Scene03::run() {
break;
case TALK_CURSOR:
if (_platypusHypnotized) {
- gnap.playBrainPulsating(8, 4);
+ gnap.playBrainPulsating(Common::Point(8, 4));
} else {
gnap._idleFacing = kDirBottomRight;
gnap.walkTo(_vm->_hotspotsWalkPos[4], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
@@ -1078,7 +1078,7 @@ void Scene03::run() {
}
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1206,7 +1206,7 @@ void Scene03::updateAnimations() {
updateHotspots();
break;
case kAS03HypnotizePlat:
- gnap.playBrainPulsating(0, 0);
+ gnap.playBrainPulsating();
_vm->addFullScreenSprite(0x106, 255);
gameSys.setAnimation(0x1C9, 256, 1);
gameSys.insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
@@ -1222,7 +1222,7 @@ void Scene03::updateAnimations() {
updateHotspots();
break;
case kAS03HypnotizeScaredPlat:
- gnap.playBrainPulsating(0, 0);
+ gnap.playBrainPulsating();
gameSys.insertSequence(0x1BF, 99, plat._sequenceId | (plat._sequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
gameSys.setAnimation(0x1BF, 99, 1);
while (gameSys.getAnimationStatus(1) != 2)
@@ -1457,7 +1457,7 @@ void Scene04::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1473,11 +1473,11 @@ void Scene04::run() {
gnap.playMoan1(plat._pos.x, plat._pos.y);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1501,7 +1501,7 @@ void Scene04::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1526,7 +1526,7 @@ void Scene04::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1553,12 +1553,12 @@ void Scene04::run() {
case TALK_CURSOR:
gnap._idleFacing = kDirBottomRight;
if (gnap.walkTo(gnap._pos, 0, -1, 1)) {
- gnap.playBrainPulsating(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+ gnap.playBrainPulsating(_vm->_hotspotsWalkPos[2]);
_nextDogSequenceId = 0x20E;
}
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1589,7 +1589,7 @@ void Scene04::run() {
}
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1615,7 +1615,7 @@ void Scene04::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
} else if (_vm->isFlag(kGFKeysTaken)) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1633,7 +1633,7 @@ void Scene04::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1935,7 +1935,7 @@ void Scene05::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1948,11 +1948,11 @@ void Scene05::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1964,7 +1964,7 @@ void Scene05::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
} else if (_vm->isFlag(kGFNeedleTaken)) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1972,7 +1972,7 @@ void Scene05::run() {
break;
case GRAB_CURSOR:
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFPlatypus)) {
@@ -1983,7 +1983,7 @@ void Scene05::run() {
}
if (gnap._pos.x == 4 && (gnap._pos.y == 8 || gnap._pos.y == 7))
gnap.walkStep();
- gnap.playIdle(plat._pos.x, plat._pos.y);
+ gnap.playIdle(plat._pos);
}
break;
}
@@ -2016,7 +2016,7 @@ void Scene05::run() {
gnap._actionStatus = kAS05TalkChicken;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2039,7 +2039,7 @@ void Scene05::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2075,7 +2075,7 @@ void Scene05::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2364,7 +2364,7 @@ void Scene06::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
gnap.useDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2377,11 +2377,11 @@ void Scene06::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2399,7 +2399,7 @@ void Scene06::run() {
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFUnk04)) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else if (triedDeviceOnGas) {
_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
gnap.walkTo(_vm->_hotspotsWalkPos[1], 0, 0x107BC, 1);
@@ -2413,7 +2413,7 @@ void Scene06::run() {
case TALK_CURSOR:
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk04))
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
else
gnap.playScratchingHead(5, 0);
break;
@@ -2433,7 +2433,7 @@ void Scene06::run() {
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFGasTaken))
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
else {
gnap.walkTo(_vm->_hotspotsWalkPos[2], 0, 0x107BB, 1);
gnap._actionStatus = kAS06TryToClimbLadder;
@@ -2442,7 +2442,7 @@ void Scene06::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2480,7 +2480,7 @@ void Scene06::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2752,7 +2752,7 @@ void Scene07::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -2791,7 +2791,7 @@ void Scene07::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3012,7 +3012,7 @@ void Scene08::run() {
case kH08SPlatypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -3026,7 +3026,7 @@ void Scene08::run() {
gnap.kissPlatypus(8);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -3065,7 +3065,7 @@ void Scene08::run() {
gnap._idleFacing = kDirUpRight;
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpLeft;
@@ -3079,7 +3079,7 @@ void Scene08::run() {
plat.walkTo(Common::Point(6, 6), 1, 0x107C2, 1);
plat._actionStatus = kAS08PlatWithMan;
plat._idleFacing = kDirNone;
- gnap.playIdle(6, 6);
+ gnap.playIdle(Common::Point(6, 6));
break;
}
}
@@ -3115,7 +3115,7 @@ void Scene08::run() {
plat.walkTo(Common::Point(3, 7), 1, 0x107C2, 1);
plat._actionStatus = kAS08PlatWithDog;
plat._idleFacing = kDirNone;
- gnap.playIdle(3, 7);
+ gnap.playIdle(Common::Point(3, 7));
break;
}
}
@@ -3141,7 +3141,7 @@ void Scene08::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3167,7 +3167,7 @@ void Scene08::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3193,7 +3193,7 @@ void Scene08::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3459,7 +3459,7 @@ void Scene09::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -3499,7 +3499,7 @@ void Scene09::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index a4e4e9f49c..db244f2feb 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -109,7 +109,7 @@ void Scene10::run() {
switch (_vm->_sceneClickedHotspot) {
case kHS10Platypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -122,7 +122,7 @@ void Scene10::run() {
gnap.kissPlatypus(10);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -160,7 +160,7 @@ void Scene10::run() {
gnap.playScratchingHead(6, 0);
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
gnap._idleFacing = kDirBottomRight;
break;
case TALK_CURSOR:
@@ -201,7 +201,7 @@ void Scene10::run() {
}
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFMudTaken))
@@ -232,7 +232,7 @@ void Scene10::run() {
gnap._actionStatus = kAS10AnnoyCook;
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFMudTaken))
@@ -246,7 +246,7 @@ void Scene10::run() {
plat._actionStatus = kAS10PlatWithBox;
plat._idleFacing = kDirUnk4;
_vm->_largeSprite = gameSys.createSurface(0xC3);
- gnap.playIdle(7, 6);
+ gnap.playIdle(Common::Point(7, 6));
}
break;
}
@@ -274,7 +274,7 @@ void Scene10::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -607,7 +607,7 @@ void Scene11::run() {
switch (_vm->_sceneClickedHotspot) {
case kHS11Platypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -617,7 +617,7 @@ void Scene11::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -665,7 +665,7 @@ void Scene11::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpLeft;
@@ -699,7 +699,7 @@ void Scene11::run() {
gnap._actionStatus = kAS11TalkHookGuy;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -709,7 +709,7 @@ void Scene11::run() {
case kHS11Billard:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(9, 8);
+ gnap.playImpossible(Common::Point(9, 8));
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -721,7 +721,7 @@ void Scene11::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(9, 8);
+ gnap.playImpossible(Common::Point(9, 8));
break;
}
}
@@ -1040,7 +1040,7 @@ void Scene12::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -1093,7 +1093,7 @@ void Scene12::run() {
plat.walkTo(Common::Point(3, 7), 1, 0x107D2, 1);
plat._actionStatus = kAS12PlatWithToothGuy;
plat._idleFacing = kDirUnk4;
- gnap.playIdle(2, 7);
+ gnap.playIdle(Common::Point(2, 7));
break;
}
}
@@ -1118,7 +1118,7 @@ void Scene12::run() {
gnap._actionStatus = kAS12LookBarkeeper;
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpRight;
@@ -1163,7 +1163,7 @@ void Scene12::run() {
plat.walkTo(Common::Point(7, 6), 1, 0x107C2, 1);
plat._actionStatus = kAS12PlatWithBeardGuy;
plat._idleFacing = kDirNone;
- gnap.playIdle(7, 6);
+ gnap.playIdle(Common::Point(7, 6));
break;
}
}
@@ -1421,7 +1421,7 @@ void Scene12::updateAnimations() {
if (gameSys.getAnimationStatus(3) == 2) {
if (gnap._actionStatus == kAS12PlatWithBarkeeper && _currBarkeeperSequenceId == 0x1F9) {
gnap._actionStatus = -1;
- gnap.playIdle(7, 6);
+ gnap.playIdle(Common::Point(7, 6));
_vm->_timers[5] = 0;
}
if (_nextBarkeeperSequenceId != -1) {
@@ -1553,7 +1553,7 @@ void Scene13::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
@@ -1599,7 +1599,7 @@ void Scene13::run() {
}
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1640,7 +1640,7 @@ void Scene13::run() {
gnap.walkTo(Common::Point(7, 7), -1, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)), 1);
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1662,7 +1662,7 @@ void Scene13::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1670,7 +1670,7 @@ void Scene13::run() {
case kHS13Sink:
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1684,7 +1684,7 @@ void Scene13::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2580,11 +2580,11 @@ void Scene17::run() {
gnap.playScratchingHead(plat._pos.x, plat._pos.y);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2594,7 +2594,7 @@ void Scene17::run() {
case kHS17Wrench:
if (gnap._actionStatus < 0) {
if (_vm->isFlag(kGFGrassTaken)) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 7);
} else {
@@ -2604,7 +2604,7 @@ void Scene17::run() {
gnap.playScratchingHead(8, 7);
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_canTryGetWrench) {
@@ -2615,7 +2615,7 @@ void Scene17::run() {
gnap._actionStatus = kAS17TryGetWrench;
_vm->_timers[5] = _vm->getRandom(30) + 80;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2640,10 +2640,10 @@ void Scene17::run() {
gnap.walkTo(gnap._pos, 0, gnap.getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2]) | 0x10000, 1);
gnap._actionStatus = kAS17GetCoinFromPhone;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2656,7 +2656,7 @@ void Scene17::run() {
plat._actionStatus = kAS17PlatUsePhone;
gnap._actionStatus = kAS17PlatUsePhone;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2684,10 +2684,10 @@ void Scene17::run() {
gnap._actionStatus = kAS17GnapUsePhone;
_vm->setFlag(kGFSpringTaken);
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2700,7 +2700,7 @@ void Scene17::run() {
plat._actionStatus = kAS17PlatUsePhone;
gnap._actionStatus = kAS17PlatUsePhone;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3492,11 +3492,11 @@ void Scene18::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3524,7 +3524,7 @@ void Scene18::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3537,7 +3537,7 @@ void Scene18::run() {
if (_vm->_grabCursorSpriteIndex >= 0)
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 1, 5);
else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
if (_vm->isFlag(kGFPlatypusTalkingToAssistant))
platEndPhoning(true);
@@ -3568,7 +3568,7 @@ void Scene18::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3601,14 +3601,14 @@ void Scene18::run() {
} else {
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3630,11 +3630,11 @@ void Scene18::run() {
_vm->_hotspots[kHS18WalkArea2]._flags &= ~SF_WALKABLE;
gnap._actionStatus = kAS18CloseTopValve;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3646,7 +3646,7 @@ void Scene18::run() {
if (gnap._actionStatus < 0) {
if (_vm->isFlag(kGFUnk14)) {
if (_vm->_grabCursorSpriteIndex == -1) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
}
@@ -3679,7 +3679,7 @@ void Scene18::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3694,7 +3694,7 @@ void Scene18::run() {
putDownGarbageCan(0);
}
if (_vm->isFlag(kGFPictureTaken)) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
_vm->_isLeavingScene = true;
_vm->_newSceneNum = 19;
@@ -4191,7 +4191,7 @@ void Scene19::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -4201,11 +4201,11 @@ void Scene19::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -4244,7 +4244,7 @@ void Scene19::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -4267,7 +4267,7 @@ void Scene19::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -4283,7 +4283,7 @@ void Scene19::run() {
case kHS19Toy7:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+ gnap.playImpossible(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot]);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -4291,12 +4291,12 @@ void Scene19::run() {
break;
case GRAB_CURSOR:
gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
- gnap.playIdle(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+ gnap.playIdle(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot]);
gnap._actionStatus = kAS19GrabToy;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -4314,12 +4314,12 @@ void Scene19::run() {
break;
case GRAB_CURSOR:
gnap.walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
- gnap.playIdle(8, 2);
+ gnap.playIdle(Common::Point(8, 2));
gnap._actionStatus = kAS19UsePhone;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -4463,7 +4463,7 @@ void Scene19::updateAnimations() {
while (_vm->_timers[5]) {
_vm->gameUpdateTick();
}
- gnap.playIdle(6, 2);
+ gnap.playIdle(Common::Point(6, 2));
gnap._actionStatus = -1;
break;
case 0x67:
@@ -4474,7 +4474,7 @@ void Scene19::updateAnimations() {
gnap._actionStatus = -1;
break;
case 0x65:
- gnap.playIdle(6, 2);
+ gnap.playIdle(Common::Point(6, 2));
gameSys.setAnimation(_nextShopAssistantSequenceId, 20, 0);
gameSys.insertSequence(_nextShopAssistantSequenceId, 20, _currShopAssistantSequenceId, 20, kSeqSyncWait, 0, 0, 0);
_currShopAssistantSequenceId = _nextShopAssistantSequenceId;
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index f3a677ae14..33322cc70b 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -278,7 +278,7 @@ void Scene20::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -288,11 +288,11 @@ void Scene20::run() {
gnap.kissPlatypus(20);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -378,7 +378,7 @@ void Scene20::run() {
if (_stonerGuyShowingJoint)
gnap._actionStatus = kAS20GrabJoint;
else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpRight;
@@ -389,7 +389,7 @@ void Scene20::run() {
gnap._actionStatus = kAS20TalkStonerGuyHasJoint;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -417,7 +417,7 @@ void Scene20::run() {
gnap._actionStatus = kAS20TalkGroceryStoreGuy;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -445,7 +445,7 @@ void Scene20::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -799,7 +799,7 @@ void Scene21::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -809,11 +809,11 @@ void Scene21::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -869,7 +869,7 @@ void Scene21::run() {
gnap._actionStatus = kAS21TalkOldLady;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1118,7 +1118,7 @@ void Scene22::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1128,11 +1128,11 @@ void Scene22::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1169,7 +1169,7 @@ void Scene22::run() {
gnap.playScratchingHead(8, 4);
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpRight;
@@ -1344,7 +1344,7 @@ void Scene23::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1354,11 +1354,11 @@ void Scene23::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1381,7 +1381,7 @@ void Scene23::run() {
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFSceneFlag1))
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
else {
gnap._idleFacing = kDirBottomRight;
gnap.walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, gnap.getSequenceId(gskIdle, Common::Point(0, 0)) | 0x10000, 1);
@@ -1392,7 +1392,7 @@ void Scene23::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1615,7 +1615,7 @@ void Scene24::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1625,11 +1625,11 @@ void Scene24::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1864,7 +1864,7 @@ void Scene25::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1874,11 +1874,11 @@ void Scene25::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1908,7 +1908,7 @@ void Scene25::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1950,7 +1950,7 @@ void Scene25::run() {
case kHS25Posters4:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1961,7 +1961,7 @@ void Scene25::run() {
gnap._idleFacing = kDirBottomRight;
else
gnap._idleFacing = kDirUpRight;
- gnap.playIdle(0, 0);
+ gnap.playIdle();
playAnims(8 - _vm->_sceneClickedHotspot + 1);
break;
case GRAB_CURSOR:
@@ -2063,7 +2063,7 @@ void Scene25::updateAnimations() {
_currTicketVendorSequenceId = _nextTicketVendorSequenceId;
_nextTicketVendorSequenceId = -1;
_vm->_hotspots[kHS25WalkArea1]._flags |= SF_WALKABLE;
- gnap.playIdle(0, 0);
+ gnap.playIdle();
gnap.walkTo(_vm->_hotspotsWalkPos[3], -1, 0x107BB, 1);
_vm->_hotspots[kHS25WalkArea1]._flags &= ~SF_WALKABLE;
gnap._actionStatus = kAS25EnterCircusWihoutTicketDone;
@@ -2183,7 +2183,7 @@ void Scene26::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2193,11 +2193,11 @@ void Scene26::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2420,7 +2420,7 @@ void Scene27::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2430,11 +2430,11 @@ void Scene27::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2461,7 +2461,7 @@ void Scene27::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2484,7 +2484,7 @@ void Scene27::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2794,7 +2794,7 @@ void Scene28::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2804,11 +2804,11 @@ void Scene28::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2841,7 +2841,7 @@ void Scene28::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2854,7 +2854,7 @@ void Scene28::run() {
if (_vm->_verbCursor == LOOK_CURSOR)
gnap.playScratchingHead(5, 2);
else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithBeer) {
gnap._idleFacing = kDirUpLeft;
gnap.walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
@@ -2881,7 +2881,7 @@ void Scene28::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2905,7 +2905,7 @@ void Scene28::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
gnap.playShowItem(_vm->_grabCursorSpriteIndex, 8, 6);
} else if (_vm->isFlag(kGFUnk21)) {
- gnap.playImpossible(8, 6);
+ gnap.playImpossible(Common::Point(8, 6));
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2917,7 +2917,7 @@ void Scene28::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3117,7 +3117,7 @@ void Scene29::updateHotspots() {
_vm->setHotspot(kHS29Monkey, 410, 374, 518, 516, SF_WALKABLE | SF_DISABLED, 3, 7);
_vm->setHotspot(kHS29ExitCircus, 150, 585, 650, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 9);
_vm->setHotspot(kHS29ExitOutsideClown, 785, 0, 800, 600, SF_EXIT_R_CURSOR | SF_WALKABLE, 11, 9);
- _vm->setHotspot(kHS29Aracde, 88, 293, 155, 384, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 8);
+ _vm->setHotspot(kHS29Arcade, 88, 293, 155, 384, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 8);
_vm->setHotspot(kHS29WalkArea1, 0, 0, 800, 478);
_vm->setDeviceHotspot(kHS29Device, -1, -1, -1, -1);
if (_vm->invHas(kItemHorn))
@@ -3188,7 +3188,7 @@ void Scene29::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -3198,11 +3198,11 @@ void Scene29::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3226,11 +3226,11 @@ void Scene29::run() {
gnap.playScratchingHead(5, 6);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y);
+ gnap.playBrainPulsating(_vm->_hotspotsWalkPos[kHS29Monkey]);
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -3257,17 +3257,17 @@ void Scene29::run() {
}
break;
- case kHS29Aracde:
+ case kHS29Arcade:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) {
_vm->setGrabCursorSprite(-1);
_vm->_isLeavingScene = true;
_vm->_newSceneNum = 52;
- gnap.walkTo(_vm->_hotspotsWalkPos[kHS29Aracde], 0, -1, 1);
- gnap.playIdle(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y);
+ gnap.walkTo(_vm->_hotspotsWalkPos[kHS29Arcade], 0, -1, 1);
+ gnap.playIdle(_vm->_hotspotsWalkPos[kHS29Arcade]);
gnap._actionStatus = kAS29LeaveScene;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y, 2, 3);
+ gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Arcade].x, _vm->_hotspotsWalkPos[kHS29Arcade].y, 2, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -3276,7 +3276,7 @@ void Scene29::run() {
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
diff --git a/engines/gnap/scenes/group2.h b/engines/gnap/scenes/group2.h
index 3b74d85bea..da4ff70407 100644
--- a/engines/gnap/scenes/group2.h
+++ b/engines/gnap/scenes/group2.h
@@ -136,7 +136,7 @@ enum {
kHS29Device = 2,
kHS29ExitCircus = 3,
kHS29ExitOutsideClown = 4,
- kHS29Aracde = 5,
+ kHS29Arcade = 5,
kHS29WalkArea1 = 6
};
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index a740d21a7e..c650ec75ca 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -93,7 +93,7 @@ void Scene30::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -103,11 +103,11 @@ void Scene30::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -135,7 +135,7 @@ void Scene30::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(8, 5);
+ gnap.playImpossible(Common::Point(8, 5));
break;
}
}
@@ -351,7 +351,7 @@ void Scene31::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
gnap.useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -361,11 +361,11 @@ void Scene31::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -378,7 +378,7 @@ void Scene31::run() {
if (_vm->_verbCursor == LOOK_CURSOR)
gnap.playScratchingHead(2, 2);
else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
gnap.playShowCurrItem(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, 2, 2);
} else {
@@ -395,7 +395,7 @@ void Scene31::run() {
_vm->_timers[4] = 300;
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
if (!_vm->invHas(kItemBucketWithBeer)) {
@@ -408,7 +408,7 @@ void Scene31::run() {
gnap._actionStatus = kAS31PlatMeasuringClown;
_vm->_timers[4] = 300;
} else
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -445,7 +445,7 @@ void Scene31::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -704,7 +704,7 @@ void Scene32::run() {
case kHS32Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -714,11 +714,11 @@ void Scene32::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -882,7 +882,7 @@ void Scene33::run() {
case kHS33Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -892,11 +892,11 @@ void Scene33::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -923,7 +923,7 @@ void Scene33::run() {
break;
case LOOK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1166,7 +1166,7 @@ void Scene38::run() {
if (gnap._actionStatus == kAS38HoldingHuntingTrophy) {
gnap._actionStatus = kAS38ReleaseHuntingTrophy;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1176,11 +1176,11 @@ void Scene38::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -1232,7 +1232,7 @@ void Scene38::run() {
break;
case GRAB_CURSOR:
if (plat._actionStatus == kAS38PlatypusHoldingTrapDoor)
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
else {
gnap.walkTo(Common::Point(3, 6), 0, 0x107BB, 1);
plat.walkTo(Common::Point(4, 8), -1, -1, 1);
@@ -1240,10 +1240,10 @@ void Scene38::run() {
}
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(2, 0);
+ gnap.playBrainPulsating(Common::Point(2, 0));
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1476,7 +1476,7 @@ void Scene39::run() {
case kHS39Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1486,11 +1486,11 @@ void Scene39::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -1510,18 +1510,18 @@ void Scene39::run() {
case kHS39Sign:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
gnap.walkTo(_vm->_hotspotsWalkPos[kHS39Sign], 0, -1, 1);
- gnap.playIdle(_vm->_hotspotsWalkPos[kHS39Sign].x, _vm->_hotspotsWalkPos[kHS39Sign].y);
+ gnap.playIdle(_vm->_hotspotsWalkPos[kHS39Sign]);
_vm->showFullScreenSprite(0x1C);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 3cbfe4d967..4f072793d4 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -79,7 +79,7 @@ void Scene40::run() {
case kHS40Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -89,11 +89,11 @@ void Scene40::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -357,7 +357,7 @@ void Scene41::run() {
case kHS41Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -367,11 +367,11 @@ void Scene41::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -414,7 +414,7 @@ void Scene41::run() {
gnap.playMoan1(5, 0);
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpRight;
@@ -422,7 +422,7 @@ void Scene41::run() {
gnap._actionStatus = kAS41TalkToyVendor;
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -450,7 +450,7 @@ void Scene41::run() {
gnap.walkTo(Common::Point(7, 7), 0, gnap.getSequenceId(gskBrainPulsating, Common::Point(0, 0)) | 0x10000, 1);
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -872,7 +872,7 @@ void Scene42::run() {
case kHS42Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -882,11 +882,11 @@ void Scene42::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -937,7 +937,7 @@ void Scene42::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -957,7 +957,7 @@ void Scene42::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1333,7 +1333,7 @@ void Scene43::run() {
case kHS43Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1343,11 +1343,11 @@ void Scene43::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -1393,7 +1393,7 @@ void Scene43::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1415,7 +1415,7 @@ void Scene43::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1784,7 +1784,7 @@ void Scene44::run() {
case kHS44Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1794,11 +1794,11 @@ void Scene44::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -1838,7 +1838,7 @@ void Scene44::run() {
gnap.playScratchingHead(4, 3);
break;
case GRAB_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case TALK_CURSOR:
gnap._idleFacing = kDirUpLeft;
@@ -1850,7 +1850,7 @@ void Scene44::run() {
plat.walkTo(Common::Point(6, 7), 1, 0x107D2, 1);
if (gnap._pos == Common::Point(7, 7))
gnap.walkStep();
- gnap.playIdle(5, 7);
+ gnap.playIdle(Common::Point(5, 7));
plat._actionStatus = 4;
break;
}
@@ -1874,10 +1874,10 @@ void Scene44::run() {
updateHotspots();
break;
case TALK_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -1900,7 +1900,7 @@ void Scene44::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2277,7 +2277,7 @@ void Scene45::run() {
case kHS45Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2289,11 +2289,11 @@ void Scene45::run() {
gameSys.setAnimation(plat._sequenceId, plat._id, 1);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -2353,7 +2353,7 @@ void Scene45::run() {
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2606,7 +2606,7 @@ void Scene46::run() {
case kHS46Platypus:
if (gnap._actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2616,11 +2616,11 @@ void Scene46::run() {
gnap.kissPlatypus(0);
break;
case TALK_CURSOR:
- gnap.playBrainPulsating(plat._pos.x, plat._pos.y);
+ gnap.playBrainPulsating(plat._pos);
plat.playSequence(plat.getSequenceId());
break;
case PLAT_CURSOR:
- gnap.playImpossible(plat._pos.x, plat._pos.y);
+ gnap.playImpossible(plat._pos);
break;
}
}
@@ -2642,7 +2642,7 @@ void Scene46::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
@@ -2663,7 +2663,7 @@ void Scene46::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- gnap.playImpossible(0, 0);
+ gnap.playImpossible();
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 19:09:11 +0000