aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-05-07 23:18:36 +0200
committerEugene Sandulenko2016-05-10 12:14:54 +0200
commita508936349cd29ef2d89735699fac0b933ff9b7d (patch)
tree7e38f8c5a52b9a8c544c588411d91aa3066bfa8b
parent8a725082a512d080ff394ee38370c96c6f13ec0b (diff)
downloadscummvm-rg350-a508936349cd29ef2d89735699fac0b933ff9b7d.tar.gz
scummvm-rg350-a508936349cd29ef2d89735699fac0b933ff9b7d.tar.bz2
scummvm-rg350-a508936349cd29ef2d89735699fac0b933ff9b7d.zip
GNAP: Move Gnap action functions to PlayerGnap
Diffstat
-rw-r--r--engines/gnap/character.cpp47
-rw-r--r--engines/gnap/character.h11
-rw-r--r--engines/gnap/gnap.cpp47
-rw-r--r--engines/gnap/gnap.h11
-rw-r--r--engines/gnap/scenes/group0.cpp302
-rw-r--r--engines/gnap/scenes/group1.cpp266
-rw-r--r--engines/gnap/scenes/group2.cpp226
-rw-r--r--engines/gnap/scenes/group3.cpp102
-rw-r--r--engines/gnap/scenes/group4.cpp146
9 files changed, 579 insertions, 579 deletions
diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 6ae731671d..ee8196138a 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -1053,6 +1053,53 @@ void PlayerGnap::actionIdle(int sequenceId) {
}
}
+void PlayerGnap::playImpossible(int gridX, int gridY) {
+ playSequence(getSequenceId(gskImpossible, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playScratchingHead(int gridX, int gridY) {
+ playSequence(getSequenceId(gskScratchingHead, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playMoan1(int gridX, int gridY) {
+ playSequence(getSequenceId(gskMoan1, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playMoan2(int gridX, int gridY) {
+ playSequence(getSequenceId(gskMoan2, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playBrainPulsating(int gridX, int gridY) {
+ playSequence(getSequenceId(gskBrainPulsating, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playPullOutDevice(int gridX, int gridY) {
+ playSequence(getSequenceId(gskPullOutDevice, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playPullOutDeviceNonWorking(int gridX, int gridY) {
+ playSequence(getSequenceId(gskPullOutDeviceNonWorking, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playUseDevice(int gridX, int gridY) {
+ playSequence(getSequenceId(gskUseDevice, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playIdle(int gridX, int gridY) {
+ playSequence(getSequenceId(gskIdle, gridX, gridY) | 0x10000);
+}
+
+void PlayerGnap::playShowItem(int itemIndex, int gridLookX, int gridLookY) {
+ playSequence(getShowSequenceId(itemIndex, gridLookX, gridLookY) | 0x10000);
+}
+
+void PlayerGnap::playShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY) {
+ if (_vm->_plat->_pos.x == gridX && _vm->_plat->_pos.y == gridY)
+ _vm->_plat->makeRoom();
+ walkTo(Common::Point(gridX, gridY), -1, -1, 1);
+ playShowItem(_vm->_grabCursorSpriteIndex, gridLookX, gridLookY);
+}
+
/************************************************************************************************/
PlayerPlat::PlayerPlat(GnapEngine * vm) : Character(vm) {}
diff --git a/engines/gnap/character.h b/engines/gnap/character.h
index 114b3a3290..d04c59462c 100644
--- a/engines/gnap/character.h
+++ b/engines/gnap/character.h
@@ -95,6 +95,17 @@ 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 playMoan1(int gridX, int gridY);
+ void playMoan2(int gridX, int gridY);
+ void playPullOutDevice(int gridX, int gridY);
+ void playPullOutDeviceNonWorking(int gridX, int gridY);
+ void playScratchingHead(int gridX, int gridY);
+ void playShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY);
+ void playShowItem(int itemIndex, int gridLookX, int gridLookY);
+ void playUseDevice(int gridX, int gridY);
void useDeviceOnPlatypus();
void useJointOnPlatypus();
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index e40d50e621..3b6f84af37 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -941,53 +941,6 @@ void GnapEngine::deleteSurface(Graphics::Surface **surface) {
}
}
-void GnapEngine::playGnapImpossible(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskImpossible, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapScratchingHead(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskScratchingHead, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapMoan1(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskMoan1, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapMoan2(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskMoan2, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapBrainPulsating(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskBrainPulsating, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapPullOutDevice(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskPullOutDevice, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapPullOutDeviceNonWorking(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskPullOutDeviceNonWorking, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapUseDevice(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskUseDevice, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapIdle(int gridX, int gridY) {
- _gnap->playSequence(_gnap->getSequenceId(gskIdle, gridX, gridY) | 0x10000);
-}
-
-void GnapEngine::playGnapShowItem(int itemIndex, int gridLookX, int gridLookY) {
- _gnap->playSequence(_gnap->getShowSequenceId(itemIndex, gridLookX, gridLookY) | 0x10000);
-}
-
-void GnapEngine::playGnapShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY) {
- if (_plat->_pos.x == gridX && _plat->_pos.y == gridY)
- _plat->makeRoom();
- _gnap->walkTo(Common::Point(gridX, gridY), -1, -1, 1);
- playGnapShowItem(_grabCursorSpriteIndex, gridLookX, gridLookY);
-}
-
bool GnapEngine::testWalk(int animationIndex, int someStatus, int gridX1, int gridY1, int gridX2, int gridY2) {
if (_mouseClickState._left && someStatus == _gnap->_actionStatus) {
_isLeavingScene = false;
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index 15e1753fda..8446454ba5 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -475,17 +475,6 @@ public:
bool testWalk(int animationIndex, int someStatus, int gridX1, int gridY1, int gridX2, int gridY2);
// Gnap
- void playGnapImpossible(int gridX, int gridY);
- void playGnapScratchingHead(int gridX, int gridY);
- void playGnapMoan1(int gridX, int gridY);
- void playGnapMoan2(int gridX, int gridY);
- void playGnapBrainPulsating(int gridX, int gridY);
- void playGnapPullOutDevice(int gridX, int gridY);
- void playGnapPullOutDeviceNonWorking(int gridX, int gridY);
- void playGnapUseDevice(int gridX, int gridY);
- void playGnapIdle(int gridX, int gridY);
- void playGnapShowItem(int itemIndex, int gridLookX, int gridLookY);
- void playGnapShowCurrItem(int gridX, int gridY, int gridLookX, int gridLookY);
void doCallback(int callback);
bool gnapPlatypusAction(int gridX, int gridY, int platSequenceId, int callback);
void gnapUseDisguiseOnPlatypus();
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index d65558474c..780c4d2616 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -126,24 +126,24 @@ void Scene01::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -153,7 +153,7 @@ void Scene01::run() {
case kHS01Spaceship:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -164,7 +164,7 @@ void Scene01::run() {
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -174,11 +174,11 @@ void Scene01::run() {
case kHS01Mud:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 3);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(3, 3);
+ _vm->_gnap->playScratchingHead(3, 3);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[2], 0, _vm->_gnap->getSequenceId(gskIdle, 2, 3) | 0x10000, 1);
@@ -186,7 +186,7 @@ void Scene01::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -196,7 +196,7 @@ void Scene01::run() {
case kHS01Pigs:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 7, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 7, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -215,7 +215,7 @@ void Scene01::run() {
_vm->_gnap->_actionStatus = kAS01LookPigs;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -312,8 +312,8 @@ void Scene01::updateAnimations() {
break;
case kAS01TakeMud:
- _vm->playGnapPullOutDevice(2, 3);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(2, 3);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(128, 40, 129, 40, kSeqSyncWait, 0, 0, 0);
gameSys.setAnimation(128, 40, 3);
_vm->_gnap->_actionStatus = -1;
@@ -327,8 +327,8 @@ void Scene01::updateAnimations() {
break;
case kAS01UsePigs:
- _vm->playGnapPullOutDevice(7, 2);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(7, 2);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0);
_vm->_gnap->_actionStatus = -1;
break;
@@ -476,24 +476,24 @@ void Scene02::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -508,11 +508,11 @@ void Scene02::run() {
_vm->_gnap->walkTo(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);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, 9, 8);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(9, 8);
+ _vm->_gnap->playMoan2(9, 8);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirBottomRight;
@@ -527,7 +527,7 @@ void Scene02::run() {
_vm->_gnap->_actionStatus = kAS02TalkChicken;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -552,11 +552,11 @@ void Scene02::run() {
_vm->_gnap->_actionStatus = kAS02UseGasWithTruck;
_vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(2, 2);
+ _vm->_gnap->playScratchingHead(2, 2);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFTruckKeysUsed)) {
@@ -574,7 +574,7 @@ void Scene02::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -584,11 +584,11 @@ void Scene02::run() {
case kHS02TruckGrill:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 2, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 2, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(2, 4);
+ _vm->_gnap->playMoan2(2, 4);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -597,7 +597,7 @@ void Scene02::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -804,7 +804,7 @@ void Scene02::updateAnimations() {
_vm->_timers[5] = 30;
break;
case kAS02UseTwigWithChicken:
- _vm->playGnapShowItem(5, 0, 0);
+ _vm->_gnap->playShowItem(5, 0, 0);
gameSys.insertSequence(0x155, 179, _currChickenSequenceId, 179, kSeqSyncExists, 0, 0, 0);
_currChickenSequenceId = 0x155;
_nextChickenSequenceId = -1;
@@ -941,24 +941,24 @@ void Scene03::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -970,22 +970,22 @@ void Scene03::run() {
if (_vm->isFlag(kGFGrassTaken)) {
_vm->_gnap->walkTo(Common::Point(-1, -1), -1, -1, 1);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(9, 6);
+ _vm->_gnap->playScratchingHead(9, 6);
break;
case GRAB_CURSOR:
- _vm->playGnapPullOutDevice(9, 6);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(9, 6);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
gameSys.setAnimation(0x1B3, 253, 5);
_vm->_hotspots[kHS03Grass]._flags |= SF_WALKABLE | SF_DISABLED;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1011,11 +1011,11 @@ void Scene03::run() {
case kHS03Creek:
if (_vm->_gnap->_actionStatus == -1) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(2, 8);
+ _vm->_gnap->playMoan2(2, 8);
break;
case GRAB_CURSOR:
if (!_vm->isFlag(kGFPlatypus))
@@ -1027,7 +1027,7 @@ void Scene03::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1039,11 +1039,11 @@ void Scene03::run() {
if (_vm->isFlag(kGFPlatypus)) {
_vm->_gnap->walkTo(Common::Point(-1, -1), -1, -1, 1);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 4);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 8, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 4);
+ _vm->_gnap->playScratchingHead(8, 4);
break;
case GRAB_CURSOR:
if (_platypusHypnotized) {
@@ -1059,7 +1059,7 @@ void Scene03::run() {
break;
case TALK_CURSOR:
if (_platypusHypnotized) {
- _vm->playGnapBrainPulsating(8, 4);
+ _vm->_gnap->playBrainPulsating(8, 4);
} else {
_vm->_gnap->_idleFacing = kDirBottomRight;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[4], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1);
@@ -1070,7 +1070,7 @@ void Scene03::run() {
}
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1196,7 +1196,7 @@ void Scene03::updateAnimations() {
updateHotspots();
break;
case kAS03HypnotizePlat:
- _vm->playGnapBrainPulsating(0, 0);
+ _vm->_gnap->playBrainPulsating(0, 0);
_vm->addFullScreenSprite(0x106, 255);
gameSys.setAnimation(0x1C9, 256, 1);
gameSys.insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
@@ -1212,7 +1212,7 @@ void Scene03::updateAnimations() {
updateHotspots();
break;
case kAS03HypnotizeScaredPlat:
- _vm->playGnapBrainPulsating(0, 0);
+ _vm->_gnap->playBrainPulsating(0, 0);
gameSys.insertSequence(0x1BF, 99, _vm->_plat->_sequenceId | (_vm->_plat->_sequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
gameSys.setAnimation(0x1BF, 99, 1);
while (gameSys.getAnimationStatus(1) != 2)
@@ -1445,27 +1445,27 @@ void Scene04::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
if (_vm->_cursorValue == 4)
_vm->_gnap->kissPlatypus(0);
else
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1475,21 +1475,21 @@ void Scene04::run() {
case kHS04Twig:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
break;
case GRAB_CURSOR:
- _vm->playGnapPullOutDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
- _vm->playGnapUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+ _vm->_gnap->playPullOutDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+ _vm->_gnap->playUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
gameSys.insertSequence(0x1FD, 100, 510, 100, kSeqSyncWait, 0, 0, 0);
gameSys.setAnimation(0x1FD, 100, 2);
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1499,11 +1499,11 @@ void Scene04::run() {
case kHS04Axe:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 9, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 9, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y);
+ _vm->_gnap->playMoan2(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1514,7 +1514,7 @@ void Scene04::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1524,12 +1524,12 @@ void Scene04::run() {
case kHS04Dog:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 9, 7);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 9, 7);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, -1, 1)) {
- _vm->playGnapMoan2(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+ _vm->_gnap->playMoan2(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
_nextDogSequenceId = 0x20F;
}
break;
@@ -1541,12 +1541,12 @@ void Scene04::run() {
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirBottomRight;
if (_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, -1, 1)) {
- _vm->playGnapBrainPulsating(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+ _vm->_gnap->playBrainPulsating(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
_nextDogSequenceId = 0x20E;
}
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1556,12 +1556,12 @@ void Scene04::run() {
case kHS04Door:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 4, 3);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 4, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapScratchingHead(4, 3);
+ _vm->_gnap->playScratchingHead(4, 3);
break;
case GRAB_CURSOR:
if (_vm->_cursorValue == 1) {
@@ -1577,7 +1577,7 @@ void Scene04::run() {
}
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1601,9 +1601,9 @@ void Scene04::run() {
case kHS04Window:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
} else if (_vm->isFlag(kGFKeysTaken)) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1617,11 +1617,11 @@ void Scene04::run() {
}
break;
case GRAB_CURSOR:
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y);
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1920,24 +1920,24 @@ void Scene05::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1947,17 +1947,17 @@ void Scene05::run() {
case kHS05Haystack:
if (_vm->_gnap->_actionStatus < 0 && _vm->_plat->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
} else if (_vm->isFlag(kGFNeedleTaken)) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFPlatypus)) {
@@ -1968,7 +1968,7 @@ void Scene05::run() {
}
if (_vm->_gnap->_pos.x == 4 && (_vm->_gnap->_pos.y == 8 || _vm->_gnap->_pos.y == 7))
_vm->_gnap->walkStep();
- _vm->playGnapIdle(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playIdle(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
}
break;
}
@@ -1984,11 +1984,11 @@ void Scene05::run() {
_vm->_gnap->walkTo(checkPt, 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS05UseTwigWithChicken;
} else if (_vm->_grabCursorSpriteIndex >= 0)
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7);
else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(9, 7);
+ _vm->_gnap->playMoan2(9, 7);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirBottomRight;
@@ -2001,7 +2001,7 @@ void Scene05::run() {
_vm->_gnap->_actionStatus = kAS05TalkChicken;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2011,11 +2011,11 @@ void Scene05::run() {
case kHS05Ladder:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(2, 4);
+ _vm->_gnap->playMoan2(2, 4);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirBottomLeft;
@@ -2024,7 +2024,7 @@ void Scene05::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2047,11 +2047,11 @@ void Scene05::run() {
_vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y) | 0x10000, 1))
_vm->_gnap->_actionStatus = kAS05PickPadlock;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 7, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 7, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(7, 4);
+ _vm->_gnap->playScratchingHead(7, 4);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -2060,7 +2060,7 @@ void Scene05::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2194,7 +2194,7 @@ void Scene05::updateAnimations() {
_vm->_gnap->_actionStatus = kAS05LeaveScene;
break;
case kAS05UseTwigWithChicken:
- _vm->playGnapShowItem(5, 0, 0);
+ _vm->_gnap->playShowItem(5, 0, 0);
_nextChickenSequenceId = 0x14F;
_vm->_gnap->_actionStatus = -1;
break;
@@ -2344,24 +2344,24 @@ void Scene06::run() {
if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
_vm->gnapUseDisguiseOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFKeysTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2371,15 +2371,15 @@ void Scene06::run() {
case kHS06Gas:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 5, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 5, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(5, 0);
+ _vm->_gnap->playScratchingHead(5, 0);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFUnk04)) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else if (triedDeviceOnGas) {
_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[1], 0, 0x107BC, 1);
@@ -2387,15 +2387,15 @@ void Scene06::run() {
_vm->_gnap->_actionStatus = kAS06TryToGetGas;
} else {
triedDeviceOnGas = true;
- _vm->playGnapPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+ _vm->_gnap->playPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk04))
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
else
- _vm->playGnapScratchingHead(5, 0);
+ _vm->_gnap->playScratchingHead(5, 0);
break;
}
}
@@ -2405,15 +2405,15 @@ void Scene06::run() {
case kHS06Ladder:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 4);
+ _vm->_gnap->playScratchingHead(8, 4);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFGasTaken))
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
else {
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[2], 0, 0x107BB, 1);
_vm->_gnap->_actionStatus = kAS06TryToClimbLadder;
@@ -2422,7 +2422,7 @@ void Scene06::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2441,11 +2441,11 @@ void Scene06::run() {
_vm->_gnap->_actionStatus = kAS06UseTwigOnHorse;
_vm->setGrabCursorSprite(-1);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 3, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 3, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(3, 2);
+ _vm->_gnap->playScratchingHead(3, 2);
break;
case TALK_CURSOR:
if (_horseTurnedBack) {
@@ -2460,7 +2460,7 @@ void Scene06::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2722,13 +2722,13 @@ void Scene07::run() {
case kHS07Platypus:
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -2747,7 +2747,7 @@ void Scene07::run() {
case kHS07Dice:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(4, 8, 3, 3);
+ _vm->_gnap->playShowCurrItem(4, 8, 3, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -2756,7 +2756,7 @@ void Scene07::run() {
_vm->setFlag(kGFPlatypus);
_vm->invAdd(kItemDice);
updateHotspots();
- _vm->playGnapPullOutDevice(3, 3);
+ _vm->_gnap->playPullOutDevice(3, 3);
gameSys.setAnimation(0x8E, 1, 2);
gameSys.insertSequence(0x8E, 1, 141, 1, kSeqSyncWait, 0, 0, 0);
gameSys.insertSequence(_vm->_gnap->getSequenceId(gskUseDevice, 0, 0) | 0x10000, _vm->_gnap->_id,
@@ -2767,7 +2767,7 @@ void Scene07::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2985,21 +2985,21 @@ void Scene08::run() {
case kH08SPlatypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFSceneFlag1))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->actionIdle(0x14D);
_vm->_gnap->kissPlatypus(8);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -3028,7 +3028,7 @@ void Scene08::run() {
case kHS08Man:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(6, 6, 7, 0);
+ _vm->_gnap->playShowCurrItem(6, 6, 7, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -3038,7 +3038,7 @@ void Scene08::run() {
_vm->_gnap->_idleFacing = kDirUpRight;
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -3052,7 +3052,7 @@ void Scene08::run() {
_vm->_plat->walkTo(Common::Point(6, 6), 1, 0x107C2, 1);
_vm->_plat->_actionStatus = kAS08PlatWithMan;
_vm->_plat->_idleFacing = kDirNone;
- _vm->playGnapIdle(6, 6);
+ _vm->_gnap->playIdle(6, 6);
break;
}
}
@@ -3060,13 +3060,13 @@ void Scene08::run() {
case kHS08Door:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(4, 7, 5, 0);
+ _vm->_gnap->playShowCurrItem(4, 7, 5, 0);
gameSys.setAnimation(makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, 0);
_vm->_gnap->_actionStatus = kAS08GrabDog;
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 0);
+ _vm->_gnap->playScratchingHead(6, 0);
gameSys.setAnimation(makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, 0);
_vm->_gnap->_actionStatus = kAS08LookDog;
break;
@@ -3088,7 +3088,7 @@ void Scene08::run() {
_vm->_plat->walkTo(Common::Point(3, 7), 1, 0x107C2, 1);
_vm->_plat->_actionStatus = kAS08PlatWithDog;
_vm->_plat->_idleFacing = kDirNone;
- _vm->playGnapIdle(3, 7);
+ _vm->_gnap->playIdle(3, 7);
break;
}
}
@@ -3096,25 +3096,25 @@ void Scene08::run() {
case kHS08Meat:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(6, 8, 5, 6);
+ _vm->_gnap->playShowCurrItem(6, 8, 5, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 7);
+ _vm->_gnap->playScratchingHead(6, 7);
break;
case GRAB_CURSOR:
if (_currDogSequenceId == 0x135) {
- _vm->playGnapScratchingHead(6, 7);
+ _vm->_gnap->playScratchingHead(6, 7);
} else {
_vm->_gnap->actionIdle(0x14D);
- _vm->playGnapPullOutDevice(6, 7);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(6, 7);
+ _vm->_gnap->playUseDevice(0, 0);
_nextDogSequenceId = 0x149;
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3122,25 +3122,25 @@ void Scene08::run() {
case kHS08Bone:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(2, 7, 3, 6);
+ _vm->_gnap->playShowCurrItem(2, 7, 3, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(3, 6);
+ _vm->_gnap->playScratchingHead(3, 6);
break;
case GRAB_CURSOR:
if (_currDogSequenceId == 0x135) {
- _vm->playGnapScratchingHead(3, 6);
+ _vm->_gnap->playScratchingHead(3, 6);
} else {
_vm->_gnap->actionIdle(0x14D);
- _vm->playGnapPullOutDevice(3, 6);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(3, 6);
+ _vm->_gnap->playUseDevice(0, 0);
_nextDogSequenceId = 0x14A;
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3148,25 +3148,25 @@ void Scene08::run() {
case kHS08Toy:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(8, 7, 7, 6);
+ _vm->_gnap->playShowCurrItem(8, 7, 7, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(7, 6);
+ _vm->_gnap->playScratchingHead(7, 6);
break;
case GRAB_CURSOR:
if (_currDogSequenceId == 0x135) {
- _vm->playGnapScratchingHead(7, 6);
+ _vm->_gnap->playScratchingHead(7, 6);
} else {
_vm->_gnap->actionIdle(0x14D);
- _vm->playGnapPullOutDevice(7, 6);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(7, 6);
+ _vm->_gnap->playUseDevice(0, 0);
_nextDogSequenceId = 0x14B;
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3422,13 +3422,13 @@ void Scene09::run() {
case kHS09Platypus:
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -3456,11 +3456,11 @@ void Scene09::run() {
case kHS09Trash:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(9, 6, 8, 0);
+ _vm->_gnap->playShowCurrItem(9, 6, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 3);
+ _vm->_gnap->playScratchingHead(8, 3);
break;
case GRAB_CURSOR:
_vm->_gnap->_actionStatus = kAS09SearchTrash;
@@ -3468,7 +3468,7 @@ void Scene09::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 8a6bff0fcf..18bb95553b 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -107,20 +107,20 @@ void Scene10::run() {
switch (_vm->_sceneClickedHotspot) {
case kHS10Platypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFMudTaken))
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
else
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(10);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -149,16 +149,16 @@ void Scene10::run() {
case kHS10Cook:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(4, 8, 6, 0);
+ _vm->_gnap->playShowCurrItem(4, 8, 6, 0);
gameSys.setAnimation(makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, 0);
_vm->_gnap->_actionStatus = kAS10AnnoyCook;
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 0);
+ _vm->_gnap->playScratchingHead(6, 0);
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
_vm->_gnap->_idleFacing = kDirBottomRight;
break;
case TALK_CURSOR:
@@ -180,18 +180,18 @@ void Scene10::run() {
case kHS10Tongs:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(3, 7, 4, 0);
+ _vm->_gnap->playShowCurrItem(3, 7, 4, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFMudTaken))
- _vm->playGnapMoan2(-1, -1);
+ _vm->_gnap->playMoan2(-1, -1);
else
- _vm->playGnapScratchingHead(4, 3);
+ _vm->_gnap->playScratchingHead(4, 3);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFMudTaken))
- _vm->playGnapMoan2(-1, -1);
+ _vm->_gnap->playMoan2(-1, -1);
else {
_vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
@@ -199,11 +199,11 @@ void Scene10::run() {
}
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFMudTaken))
- _vm->playGnapMoan2(-1, -1);
+ _vm->_gnap->playMoan2(-1, -1);
else {
_vm->_gnap->actionIdle(0x10C);
_vm->_gnap->useDeviceOnPlatypus();
@@ -218,11 +218,11 @@ void Scene10::run() {
case kHS10Box:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(7, 6, 6, 0);
+ _vm->_gnap->playShowCurrItem(7, 6, 6, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(7, 3);
+ _vm->_gnap->playScratchingHead(7, 3);
break;
case GRAB_CURSOR:
_vm->_gnap->actionIdle(0x10C);
@@ -230,11 +230,11 @@ void Scene10::run() {
_vm->_gnap->_actionStatus = kAS10AnnoyCook;
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFMudTaken))
- _vm->playGnapMoan2(-1, -1);
+ _vm->_gnap->playMoan2(-1, -1);
else {
_vm->invAdd(kItemTongs);
_vm->setFlag(kGFMudTaken);
@@ -244,7 +244,7 @@ void Scene10::run() {
_vm->_plat->_actionStatus = kAS10PlatWithBox;
_vm->_plat->_idleFacing = kDirUnk4;
_vm->_largeSprite = gameSys.createSurface(0xC3);
- _vm->playGnapIdle(7, 6);
+ _vm->_gnap->playIdle(7, 6);
}
break;
}
@@ -253,7 +253,7 @@ void Scene10::run() {
case kHS10Oven:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(9, 6, 10, 0);
+ _vm->_gnap->playShowCurrItem(9, 6, 10, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -272,7 +272,7 @@ void Scene10::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -591,17 +591,17 @@ void Scene11::run() {
switch (_vm->_sceneClickedHotspot) {
case kHS11Platypus:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -639,17 +639,17 @@ void Scene11::run() {
if (_vm->_grabCursorSpriteIndex == kItemMagazine) {
_vm->_gnap->walkTo(Common::Point(3, 7), 0, 0x107BC, 1);
_vm->_gnap->_actionStatus = kAS11ShowMagazineToGoggleGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(3, 7, 2, 0);
+ _vm->_gnap->playShowCurrItem(3, 7, 2, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 6);
+ _vm->_gnap->playScratchingHead(1, 6);
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -667,7 +667,7 @@ void Scene11::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
_vm->_gnap->walkTo(Common::Point(5, 6), 0, 0x107BC, 9);
_vm->_gnap->_actionStatus = kAS11ShowItemToHookGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 4, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 4, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -683,7 +683,7 @@ void Scene11::run() {
_vm->_gnap->_actionStatus = kAS11TalkHookGuy;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -693,11 +693,11 @@ void Scene11::run() {
case kHS11Billard:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(9, 8);
+ _vm->_gnap->playImpossible(9, 8);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(9, 8);
+ _vm->_gnap->playScratchingHead(9, 8);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(Common::Point(9, 8), 0, 0x107BA, 1);
@@ -705,7 +705,7 @@ void Scene11::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(9, 8);
+ _vm->_gnap->playImpossible(9, 8);
break;
}
}
@@ -1014,13 +1014,13 @@ void Scene12::run() {
case kHS12Platypus:
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -1042,22 +1042,22 @@ void Scene12::run() {
_vm->_gnap->walkTo(Common::Point(3, 7), 0, 0x107BC, 9);
_vm->_gnap->_idleFacing = kDirUpLeft;
_vm->_gnap->_actionStatus = kAS12QuarterToToothGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
_vm->setGrabCursorSprite(-1);
} else if (_vm->_grabCursorSpriteIndex == kItemQuarterWithHole) {
_vm->_gnap->walkTo(Common::Point(3, 7), 0, 0x107BC, 9);
_vm->_gnap->_idleFacing = kDirUpLeft;
_vm->_gnap->_actionStatus = kAS12QuarterWithHoleToToothGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
_vm->_gnap->walkTo(Common::Point(3, 7), 0, 0x107BC, 9);
_vm->_gnap->_idleFacing = kDirUpLeft;
_vm->_gnap->_actionStatus = kAS12ShowItemToToothGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 2, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 2);
+ _vm->_gnap->playScratchingHead(1, 2);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(Common::Point(3, 7), 0, 0x107BC, 1);
@@ -1073,7 +1073,7 @@ void Scene12::run() {
_vm->_plat->walkTo(Common::Point(3, 7), 1, 0x107D2, 1);
_vm->_plat->_actionStatus = kAS12PlatWithToothGuy;
_vm->_plat->_idleFacing = kDirUnk4;
- _vm->playGnapIdle(2, 7);
+ _vm->_gnap->playIdle(2, 7);
break;
}
}
@@ -1084,12 +1084,12 @@ void Scene12::run() {
_vm->_gnap->walkTo(Common::Point(6, 6), 0, 0x107BB, 9);
_vm->_gnap->_idleFacing = kDirUpRight;
_vm->_gnap->_actionStatus = kAS12QuarterWithBarkeeper;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 7, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 7, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
_vm->_gnap->walkTo(Common::Point(6, 6), 0, 0x107BB, 9);
_vm->_gnap->_idleFacing = kDirUpRight;
_vm->_gnap->_actionStatus = kAS12ShowItemToBarkeeper;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 7, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 7, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1098,7 +1098,7 @@ void Scene12::run() {
_vm->_gnap->_actionStatus = kAS12LookBarkeeper;
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1106,7 +1106,7 @@ void Scene12::run() {
_vm->_gnap->_actionStatus = kAS12TalkBarkeeper;
break;
case PLAT_CURSOR:
- _vm->playGnapPullOutDevice(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playPullOutDevice(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
gameSys.setAnimation(makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, 0);
_vm->_gnap->_actionStatus = kAS12PlatWithBarkeeper;
break;
@@ -1119,7 +1119,7 @@ void Scene12::run() {
_vm->_gnap->walkTo(Common::Point(7, 6), 0, 0x107BB, 9);
_vm->_gnap->_idleFacing = kDirUpRight;
_vm->_gnap->_actionStatus = kAS12ShowItemToBeardGuy;
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1143,7 +1143,7 @@ void Scene12::run() {
_vm->_plat->walkTo(Common::Point(7, 6), 1, 0x107C2, 1);
_vm->_plat->_actionStatus = kAS12PlatWithBeardGuy;
_vm->_plat->_idleFacing = kDirNone;
- _vm->playGnapIdle(7, 6);
+ _vm->_gnap->playIdle(7, 6);
break;
}
}
@@ -1399,7 +1399,7 @@ void Scene12::updateAnimations() {
if (gameSys.getAnimationStatus(3) == 2) {
if (_vm->_gnap->_actionStatus == kAS12PlatWithBarkeeper && _currBarkeeperSequenceId == 0x1F9) {
_vm->_gnap->_actionStatus = -1;
- _vm->playGnapIdle(7, 6);
+ _vm->_gnap->playIdle(7, 6);
_vm->_timers[5] = 0;
}
if (_nextBarkeeperSequenceId != -1) {
@@ -1523,13 +1523,13 @@ void Scene13::run() {
case kHS13Platypus:
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
@@ -1552,7 +1552,7 @@ void Scene13::run() {
case kHS13BackToilet:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(5, 5, 6, 0);
+ _vm->_gnap->playShowCurrItem(5, 5, 6, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1575,7 +1575,7 @@ void Scene13::run() {
}
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1583,7 +1583,7 @@ void Scene13::run() {
case kHS13FrontToilet:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(6, 7, 7, 0);
+ _vm->_gnap->playShowCurrItem(6, 7, 7, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1600,7 +1600,7 @@ void Scene13::run() {
case kHS13Scribble:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(7, 7, 8, 0);
+ _vm->_gnap->playShowCurrItem(7, 7, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1609,14 +1609,14 @@ void Scene13::run() {
_vm->_gnap->_idleFacing = kDirUpRight;
break;
case GRAB_CURSOR:
- _vm->playGnapScratchingHead(0, 0);
+ _vm->_gnap->playScratchingHead(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
_vm->_gnap->walkTo(Common::Point(7, 7), -1, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0), 1);
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1624,7 +1624,7 @@ void Scene13::run() {
case kHS13Urinal:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(8, 7, 9, 0);
+ _vm->_gnap->playShowCurrItem(8, 7, 9, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1638,7 +1638,7 @@ void Scene13::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1646,7 +1646,7 @@ void Scene13::run() {
case kHS13Sink:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1660,7 +1660,7 @@ void Scene13::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2540,19 +2540,19 @@ void Scene17::run() {
_vm->invRemove(kItemJoint);
}
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
case GRAB_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2562,17 +2562,17 @@ void Scene17::run() {
case kHS17Wrench:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->isFlag(kGFGrassTaken)) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 7);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 7);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
case GRAB_CURSOR:
- _vm->playGnapScratchingHead(8, 7);
+ _vm->_gnap->playScratchingHead(8, 7);
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_canTryGetWrench) {
@@ -2583,7 +2583,7 @@ void Scene17::run() {
_vm->_gnap->_actionStatus = kAS17TryGetWrench;
_vm->_timers[5] = _vm->getRandom(30) + 80;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2596,11 +2596,11 @@ void Scene17::run() {
_vm->_gnap->walkTo(_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);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 3);
+ _vm->_gnap->playScratchingHead(1, 3);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2608,10 +2608,10 @@ void Scene17::run() {
_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS17GetCoinFromPhone;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2624,7 +2624,7 @@ void Scene17::run() {
_vm->_plat->_actionStatus = kAS17PlatUsePhone;
_vm->_gnap->_actionStatus = kAS17PlatUsePhone;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2637,11 +2637,11 @@ void Scene17::run() {
_vm->_gnap->walkTo(_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);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 1, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 3);
+ _vm->_gnap->playScratchingHead(1, 3);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2652,10 +2652,10 @@ void Scene17::run() {
_vm->_gnap->_actionStatus = kAS17GnapUsePhone;
_vm->setFlag(kGFSpringTaken);
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (_vm->isFlag(kGFUnk18)) {
@@ -2668,7 +2668,7 @@ void Scene17::run() {
_vm->_plat->_actionStatus = kAS17PlatUsePhone;
_vm->_gnap->_actionStatus = kAS17PlatUsePhone;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2828,8 +2828,8 @@ void Scene17::updateAnimations() {
_vm->_gnap->_actionStatus = kAS17GetWrenchGnapReady;
break;
case kAS17GetCoinFromPhone:
- _vm->playGnapPullOutDevice(1, 3);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(1, 3);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.setAnimation(0x250, 100, 0);
gameSys.insertSequence(0x250, 100, 591, 100, kSeqSyncWait, 0, 0, 0);
_vm->invAdd(kItemDiceQuarterHole);
@@ -3438,21 +3438,21 @@ void Scene18::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, _vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, _vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3469,18 +3469,18 @@ void Scene18::run() {
putDownGarbageCan(0);
}
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18CowboyHat].x, _vm->_hotspotsWalkPos[kHS18CowboyHat].y, 3, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18CowboyHat].x, _vm->_hotspotsWalkPos[kHS18CowboyHat].y, 3, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(3, 2);
+ _vm->_gnap->playScratchingHead(3, 2);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS18CowboyHat], 0, _vm->_gnap->getSequenceId(gskPullOutDeviceNonWorking, 3, 2) | 0x10000, 1);
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3491,25 +3491,25 @@ void Scene18::run() {
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->isFlag(kGFUnk14)) {
if (_vm->_grabCursorSpriteIndex >= 0)
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 1, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 1, 5);
else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
if (_vm->isFlag(kGFPlatypusTalkingToAssistant))
platEndPhoning(true);
if (_vm->_grabCursorSpriteIndex >= 0) {
if (!_vm->isFlag(kGFTruckKeysUsed))
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1),
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1),
_vm->_hotspotsWalkPos[kHS18GarbageCan].y, _vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
else
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 2, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18GarbageCan].x, _vm->_hotspotsWalkPos[kHS18GarbageCan].y, 2, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (!_vm->isFlag(kGFTruckKeysUsed))
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1), _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[kHS18GarbageCan].x - (_vm->_gnap->_pos.x < _vm->_s18GarbageCanPos ? 1 : -1), _vm->_hotspotsWalkPos[kHS18GarbageCan].y);
else if (!_vm->isFlag(kGFTruckFilledWithGas))
- _vm->playGnapScratchingHead(2, 4);
+ _vm->_gnap->playScratchingHead(2, 4);
break;
case GRAB_CURSOR:
if (!_vm->isFlag(kGFTruckKeysUsed)) {
@@ -3524,7 +3524,7 @@ void Scene18::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3539,13 +3539,13 @@ void Scene18::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 0, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- _vm->playGnapScratchingHead(0, 0);
+ _vm->_gnap->playScratchingHead(0, 0);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFTruckFilledWithGas)) {
@@ -3557,14 +3557,14 @@ void Scene18::run() {
} else {
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
}
break;
case TALK_CURSOR:
case PLAT_CURSOR:
gnapCarryGarbageCanTo(-1);
putDownGarbageCan(0);
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3573,11 +3573,11 @@ void Scene18::run() {
_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, _vm->_gnap->getSequenceId(gskIdle, 2, 8) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS18OpenTopValve;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 1, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantTopValve].x, _vm->_hotspotsWalkPos[kHS18HydrantTopValve].y, 1, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 5);
+ _vm->_gnap->playScratchingHead(1, 5);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFBarnPadlockOpen)) {
@@ -3586,11 +3586,11 @@ void Scene18::run() {
_vm->_hotspots[kHS18WalkArea2]._flags &= ~SF_WALKABLE;
_vm->_gnap->_actionStatus = kAS18CloseTopValve;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3602,9 +3602,9 @@ void Scene18::run() {
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->isFlag(kGFUnk14)) {
if (_vm->_grabCursorSpriteIndex == -1) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
}
} else {
if (_vm->isFlag(kGFPlatypusDisguised)) {
@@ -3618,11 +3618,11 @@ void Scene18::run() {
else
_vm->_gnap->_actionStatus = kAS18OpenRightValveNoGarbageCan;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS18HydrantRightValve].x, _vm->_hotspotsWalkPos[kHS18HydrantRightValve].y, 1, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 5);
+ _vm->_gnap->playScratchingHead(1, 5);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFTruckFilledWithGas)) {
@@ -3635,7 +3635,7 @@ void Scene18::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3650,7 +3650,7 @@ void Scene18::run() {
putDownGarbageCan(0);
}
if (_vm->isFlag(kGFPictureTaken)) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
_vm->_isLeavingScene = true;
_vm->_newSceneNum = 19;
@@ -3836,8 +3836,8 @@ void Scene18::updateAnimations() {
case kAS18OpenTopValve:
_vm->setFlag(kGFBarnPadlockOpen);
updateHotspots();
- _vm->playGnapPullOutDevice(2, 7);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(2, 7);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(0x20C, 19, 0, 0, kSeqNone, 0, 0, 0);
_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS18HydrantTopValve], 0, 0x107BB, 1);
@@ -3934,8 +3934,8 @@ void Scene18::updateAnimations() {
case kAS18OpenRightValveWithGarbageCan:
_vm->setFlag(kGFTruckFilledWithGas);
updateHotspots();
- _vm->playGnapPullOutDevice(2, 7);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(2, 7);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(0x20B, 19, 0, 0, kSeqNone, 0, 0, 0);
_vm->_hotspots[kHS18WalkArea2]._flags |= SF_WALKABLE;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS18HydrantRightValve], 0, 0x107BA, 1);
@@ -4144,21 +4144,21 @@ void Scene19::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -4183,11 +4183,11 @@ void Scene19::run() {
case kHS19Picture:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 2);
+ _vm->_gnap->playScratchingHead(6, 2);
break;
case GRAB_CURSOR:
if (!_vm->isFlag(kGFPictureTaken)) {
@@ -4197,7 +4197,7 @@ void Scene19::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -4207,11 +4207,11 @@ void Scene19::run() {
case kHS19ShopAssistant:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 6, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 2);
+ _vm->_gnap->playScratchingHead(6, 2);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -4220,7 +4220,7 @@ void Scene19::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -4236,20 +4236,20 @@ void Scene19::run() {
case kHS19Toy7:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+ _vm->_gnap->playImpossible(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+ _vm->_gnap->playMoan2(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
- _vm->playGnapIdle(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
+ _vm->_gnap->playIdle(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y);
_vm->_gnap->_actionStatus = kAS19GrabToy;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -4259,20 +4259,20 @@ void Scene19::run() {
case kHS19Phone:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 9, 1);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 9, 1);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(9, 1);
+ _vm->_gnap->playScratchingHead(9, 1);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot], 0, -1, 1);
- _vm->playGnapIdle(8, 2);
+ _vm->_gnap->playIdle(8, 2);
_vm->_gnap->_actionStatus = kAS19UsePhone;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -4354,8 +4354,8 @@ void Scene19::updateAnimations() {
}
break;
case kAS19GrabPicture:
- _vm->playGnapPullOutDevice(6, 2);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(6, 2);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.setAnimation(0x68, 19, 0);
gameSys.insertSequence(0x68, 19, 105, 19, kSeqSyncWait, 0, 0, 0);
_vm->invAdd(kItemPicture);
@@ -4415,7 +4415,7 @@ void Scene19::updateAnimations() {
while (_vm->_timers[5]) {
_vm->gameUpdateTick();
}
- _vm->playGnapIdle(6, 2);
+ _vm->_gnap->playIdle(6, 2);
_vm->_gnap->_actionStatus = -1;
break;
case 0x67:
@@ -4426,7 +4426,7 @@ void Scene19::updateAnimations() {
_vm->_gnap->_actionStatus = -1;
break;
case 0x65:
- _vm->playGnapIdle(6, 2);
+ _vm->_gnap->playIdle(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 582aa5bae1..6599a4b15a 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -68,8 +68,8 @@ void Scene20::updateAnimationsCb() {
break;
case 0x16A:
// Grab joint
- _vm->playGnapPullOutDevice(4, 4);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(4, 4);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.setAnimation(0x16A, 21, 0);
gameSys.insertSequence(0x16A, 21, _currStonerGuySequenceId, 21, kSeqSyncWait, 0, 0, 0);
_currStonerGuySequenceId = 0x16A;
@@ -275,21 +275,21 @@ void Scene20::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(20);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -363,11 +363,11 @@ void Scene20::run() {
case kHS20StonerGuy:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS20StonerGuy].x, _vm->_hotspotsWalkPos[kHS20StonerGuy].y, 5, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS20StonerGuy].x, _vm->_hotspotsWalkPos[kHS20StonerGuy].y, 5, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(5, 4);
+ _vm->_gnap->playMoan2(5, 4);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -375,7 +375,7 @@ void Scene20::run() {
if (_stonerGuyShowingJoint)
_vm->_gnap->_actionStatus = kAS20GrabJoint;
else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -386,7 +386,7 @@ void Scene20::run() {
_vm->_gnap->_actionStatus = kAS20TalkStonerGuyHasJoint;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -396,11 +396,11 @@ void Scene20::run() {
case kHS20GroceryStoreGuy:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 2, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreGuy].y, 2, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(2, 3);
+ _vm->_gnap->playScratchingHead(2, 3);
break;
case GRAB_CURSOR:
_stonerGuyShowingJoint = false;
@@ -414,7 +414,7 @@ void Scene20::run() {
_vm->_gnap->_actionStatus = kAS20TalkGroceryStoreGuy;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -428,11 +428,11 @@ void Scene20::run() {
_vm->_gnap->walkTo(_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);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS20GroceryStoreHat].x, _vm->_hotspotsWalkPos[kHS20GroceryStoreHat].y, 1, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(1, 6);
+ _vm->_gnap->playScratchingHead(1, 6);
break;
case GRAB_CURSOR:
_stonerGuyShowingJoint = false;
@@ -442,7 +442,7 @@ void Scene20::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -793,21 +793,21 @@ void Scene21::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -817,16 +817,16 @@ void Scene21::run() {
case kHS21Banana:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 2, 5);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 2, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(2, 5);
+ _vm->_gnap->playScratchingHead(2, 5);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS21Banana].x, _vm->_hotspotsWalkPos[kHS21Banana].y) | 0x10000, 1);
- _vm->playGnapPullOutDevice(2, 5);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(2, 5);
+ _vm->_gnap->playUseDevice(0, 0);
_vm->_gnap->_actionStatus = kAS21GrabBanana;
break;
case TALK_CURSOR:
@@ -844,11 +844,11 @@ void Scene21::run() {
_vm->_gnap->walkTo(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);
+ _vm->_gnap->playShowCurrItem(4, 6, 7, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(7, 4);
+ _vm->_gnap->playScratchingHead(7, 4);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -863,7 +863,7 @@ void Scene21::run() {
_vm->_gnap->_actionStatus = kAS21TalkOldLady;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1109,21 +1109,21 @@ void Scene22::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1153,14 +1153,14 @@ void Scene22::run() {
case kHS22Cashier:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS22Cashier].x, _vm->_hotspotsWalkPos[kHS22Cashier].y, 8, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS22Cashier].x, _vm->_hotspotsWalkPos[kHS22Cashier].y, 8, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 4);
+ _vm->_gnap->playScratchingHead(8, 4);
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1332,21 +1332,21 @@ void Scene23::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1356,12 +1356,12 @@ void Scene23::run() {
case kHS23Cereals:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS23Cereals].x, _vm->_hotspotsWalkPos[kHS23Cereals].y, 5, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS23Cereals].x, _vm->_hotspotsWalkPos[kHS23Cereals].y, 5, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFSceneFlag1))
- _vm->playGnapMoan2(0, 0);
+ _vm->_gnap->playMoan2(0, 0);
else {
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS23LookCereals;
@@ -1369,7 +1369,7 @@ void Scene23::run() {
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFSceneFlag1))
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
else {
_vm->_gnap->_idleFacing = kDirBottomRight;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS23Cereals], 0, _vm->_gnap->getSequenceId(gskIdle, 0, 0) | 0x10000, 1);
@@ -1380,7 +1380,7 @@ void Scene23::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1599,21 +1599,21 @@ void Scene24::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1845,21 +1845,21 @@ void Scene25::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1871,15 +1871,15 @@ void Scene25::run() {
if (_vm->_grabCursorSpriteIndex == kItemTickets) {
_vm->_gnap->_actionStatus = kAS25ShowTicketToVendor;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS25TicketVendor], 0, _vm->_gnap->getSequenceId(gskIdle, 9, 4) | 0x10000, 1);
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, 6, 1);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS25TicketVendor].x, _vm->_hotspotsWalkPos[kHS25TicketVendor].y, 6, 1);
_nextTicketVendorSequenceId = 0x5B;
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 1);
+ _vm->_gnap->playScratchingHead(6, 1);
_nextTicketVendorSequenceId = (_vm->getRandom(2) == 1) ? 0x59 : 0x56;
break;
case TALK_CURSOR:
@@ -1889,7 +1889,7 @@ void Scene25::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1931,7 +1931,7 @@ void Scene25::run() {
case kHS25Posters4:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -1942,13 +1942,13 @@ void Scene25::run() {
_vm->_gnap->_idleFacing = kDirBottomRight;
else
_vm->_gnap->_idleFacing = kDirUpRight;
- _vm->playGnapIdle(0, 0);
+ _vm->_gnap->playIdle(0, 0);
playAnims(8 - _vm->_sceneClickedHotspot + 1);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapMoan2(0, 0);
+ _vm->_gnap->playMoan2(0, 0);
break;
}
}
@@ -2043,7 +2043,7 @@ void Scene25::updateAnimations() {
_currTicketVendorSequenceId = _nextTicketVendorSequenceId;
_nextTicketVendorSequenceId = -1;
_vm->_hotspots[kHS25WalkArea1]._flags |= SF_WALKABLE;
- _vm->playGnapIdle(0, 0);
+ _vm->_gnap->playIdle(0, 0);
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[3], -1, 0x107BB, 1);
_vm->_hotspots[kHS25WalkArea1]._flags &= ~SF_WALKABLE;
_vm->_gnap->_actionStatus = kAS25EnterCircusWihoutTicketDone;
@@ -2161,21 +2161,21 @@ void Scene26::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2395,21 +2395,21 @@ void Scene27::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2423,11 +2423,11 @@ void Scene27::run() {
if (_vm->_gnap->walkTo(_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);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS27Janitor].x, _vm->_hotspotsWalkPos[kHS27Janitor].y, 7, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 3);
+ _vm->_gnap->playScratchingHead(6, 3);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -2436,7 +2436,7 @@ void Scene27::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2446,11 +2446,11 @@ void Scene27::run() {
case kHS27Bucket:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 3, 3);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 3, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(3, 3);
+ _vm->_gnap->playScratchingHead(3, 3);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -2459,7 +2459,7 @@ void Scene27::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2587,8 +2587,8 @@ void Scene27::updateAnimations() {
}
break;
case kAS27GrabBucket:
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
_vm->_hotspots[kHS27Bucket]._flags = SF_DISABLED;
_vm->invAdd(kItemEmptyBucket);
_vm->setFlag(kGFUnk13);
@@ -2649,8 +2649,8 @@ void Scene27::updateAnimations() {
break;
case 0xD0:
// Show picture to janitor
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(_nextJanitorSequenceId, 39, _currJanitorSequenceId, 39, kSeqSyncWait, 0, 0, 0);
gameSys.setAnimation(_nextJanitorSequenceId, 39, 0);
_vm->_gnap->_actionStatus = kAS27EnterClownTent;
@@ -2766,21 +2766,21 @@ void Scene28::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2790,11 +2790,11 @@ void Scene28::run() {
case kHS28Horn:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(2, 8, 3, 4);
+ _vm->_gnap->playShowCurrItem(2, 8, 3, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(2, 4);
+ _vm->_gnap->playScratchingHead(2, 4);
break;
case GRAB_CURSOR:
if (_vm->isFlag(kGFUnk21)) {
@@ -2813,7 +2813,7 @@ void Scene28::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2824,27 +2824,27 @@ void Scene28::run() {
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->isFlag(kGFUnk21)) {
if (_vm->_verbCursor == LOOK_CURSOR)
- _vm->playGnapScratchingHead(5, 2);
+ _vm->_gnap->playScratchingHead(5, 2);
else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithBeer) {
_vm->_gnap->_idleFacing = kDirUpLeft;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
_vm->_gnap->_actionStatus = kAS28UseBeerBucketWithClown;
} else if (_vm->_grabCursorSpriteIndex == kItemBucketWithPill) {
_vm->_gnap->_idleFacing = kDirUpLeft;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS28Clown], 0, 0x107BC, 1);
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
_vm->_gnap->_actionStatus = kAS28UsePillBucketWithClown;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS28Clown].x, _vm->_hotspotsWalkPos[kHS28Clown].y, 2, 4);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS28Clown].x, _vm->_hotspotsWalkPos[kHS28Clown].y, 2, 4);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(5, 2);
+ _vm->_gnap->playScratchingHead(5, 2);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -2853,7 +2853,7 @@ void Scene28::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2875,13 +2875,13 @@ void Scene28::run() {
case kHS28EmptyBucket:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 6);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 8, 6);
} else if (_vm->isFlag(kGFUnk21)) {
- _vm->playGnapImpossible(8, 6);
+ _vm->_gnap->playImpossible(8, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 6);
+ _vm->_gnap->playScratchingHead(8, 6);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_gnap->_pos, 0, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS28EmptyBucket].x, _vm->_hotspotsWalkPos[kHS28EmptyBucket].y) | 0x10000, 1);
@@ -2889,7 +2889,7 @@ void Scene28::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2960,8 +2960,8 @@ void Scene28::updateAnimations() {
_nextClownSequenceId = 0x119;
break;
case kAS28GrabHornSuccess:
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.setAnimation(0x117, 59, 0);
gameSys.insertSequence(0x117, 59, 280, 59, kSeqSyncWait, 0, 0, 0);
_vm->_gnap->_actionStatus = kAS28GrabHornSuccessDone;
@@ -2982,8 +2982,8 @@ void Scene28::updateAnimations() {
_vm->_gnap->_actionStatus = -1;
break;
case kAS28GrabEmptyBucket:
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.setAnimation(0x111, 99, 0);
gameSys.insertSequence(0x111, 99, 274, 99, kSeqSyncWait, 0, 0, 0);
_vm->_gnap->_actionStatus = kAS28GrabEmptyBucketDone;
@@ -3157,21 +3157,21 @@ void Scene29::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3188,18 +3188,18 @@ void Scene29::run() {
_vm->_isLeavingScene = true;
_vm->setGrabCursorSprite(-1);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y, 5, 6);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y, 5, 6);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(5, 6);
+ _vm->_gnap->playScratchingHead(5, 6);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y);
+ _vm->_gnap->playBrainPulsating(_vm->_hotspotsWalkPos[kHS29Monkey].x, _vm->_hotspotsWalkPos[kHS29Monkey].y);
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -3233,19 +3233,19 @@ void Scene29::run() {
_vm->_isLeavingScene = true;
_vm->_newSceneNum = 52;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS29Aracde], 0, -1, 1);
- _vm->playGnapIdle(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y);
+ _vm->_gnap->playIdle(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y);
_vm->_gnap->_actionStatus = kAS29LeaveScene;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y, 2, 3);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS29Aracde].x, _vm->_hotspotsWalkPos[kHS29Aracde].y, 2, 3);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan2(0, 0);
+ _vm->_gnap->playMoan2(0, 0);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index 99cd34be69..ecc1238003 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -90,21 +90,21 @@ void Scene30::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -120,7 +120,7 @@ void Scene30::run() {
_vm->_gnap->_actionStatus = kAS30UsePillMachine;
hasTakenPill = true;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS30PillMachine].x, _vm->_hotspotsWalkPos[kHS30PillMachine].y, 8, 5);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS30PillMachine].x, _vm->_hotspotsWalkPos[kHS30PillMachine].y, 8, 5);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
@@ -128,11 +128,11 @@ void Scene30::run() {
_vm->_gnap->_actionStatus = kAS30LookPillMachine;
break;
case GRAB_CURSOR:
- _vm->playGnapScratchingHead(8, 5);
+ _vm->_gnap->playScratchingHead(8, 5);
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(8, 5);
+ _vm->_gnap->playImpossible(8, 5);
break;
}
}
@@ -345,21 +345,21 @@ void Scene31::run() {
if (_vm->_grabCursorSpriteIndex == kItemJoint) {
_vm->_gnap->useJointOnPlatypus();
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -370,15 +370,15 @@ void Scene31::run() {
if (_vm->_gnap->_actionStatus < 0 || _vm->_gnap->_actionStatus == kAS31PlatMeasuringClown) {
if (_vm->_gnap->_actionStatus == kAS31PlatMeasuringClown) {
if (_vm->_verbCursor == LOOK_CURSOR)
- _vm->playGnapScratchingHead(2, 2);
+ _vm->_gnap->playScratchingHead(2, 2);
else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, 2, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS31MeasuringClown].x, _vm->_hotspotsWalkPos[kHS31MeasuringClown].y + 1, 2, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(2, 2);
+ _vm->_gnap->playScratchingHead(2, 2);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS31MeasuringClown] + Common::Point(0, 1), -1, -1, 1);
@@ -389,7 +389,7 @@ void Scene31::run() {
_vm->_timers[4] = 300;
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
if (!_vm->invHas(kItemBucketWithBeer)) {
@@ -402,7 +402,7 @@ void Scene31::run() {
_vm->_gnap->_actionStatus = kAS31PlatMeasuringClown;
_vm->_timers[4] = 300;
} else
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -416,21 +416,21 @@ void Scene31::run() {
_vm->_gnap->walkTo(_vm->_gnap->_pos, -1, _vm->_gnap->getSequenceId(gskIdle, _vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y) | 0x10000, 1);
_clerkMeasureMaxCtr += 5;
gameSys.insertSequence(0xF8, 59, 0, 0, kSeqNone, 0, 0, 0);
- _vm->playGnapPullOutDevice(6, 8);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(6, 8);
+ _vm->_gnap->playUseDevice(0, 0);
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1);
_vm->_gnap->_actionStatus = kAS31FillEmptyBucketWithBeer;
_vm->_timers[4] = 300;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y, 6, 2);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS31BeerBarrel].x, _vm->_hotspotsWalkPos[kHS31BeerBarrel].y, 6, 2);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(6, 2);
+ _vm->_gnap->playScratchingHead(6, 2);
break;
case GRAB_CURSOR:
if (_beerGuyDistracted) {
- _vm->playGnapScratchingHead(6, 2);
+ _vm->_gnap->playScratchingHead(6, 2);
} else {
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS31BeerBarrel], 0, 0x107BC, 1);
_vm->_gnap->_actionStatus = kAS31UseBeerBarrel;
@@ -439,7 +439,7 @@ void Scene31::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -552,8 +552,8 @@ void Scene31::updateAnimations() {
break;
case kAS31FillEmptyBucketWithBeerDone:
_vm->_gnap->_idleFacing = kDirBottomLeft;
- _vm->playGnapPullOutDevice(0, 0);
- _vm->playGnapUseDevice(0, 0);
+ _vm->_gnap->playPullOutDevice(0, 0);
+ _vm->_gnap->playUseDevice(0, 0);
gameSys.insertSequence(0xF9, 59, 0xF8, 59, kSeqSyncWait, 0, 0, 0);
_vm->_gnap->_actionStatus = -1;
_vm->invAdd(kItemBucketWithBeer);
@@ -694,21 +694,21 @@ void Scene32::run() {
case kHS32Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -870,21 +870,21 @@ void Scene33::run() {
case kHS33Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -894,7 +894,7 @@ void Scene33::run() {
case kHS33Chicken:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(7, 9, 9, 8);
+ _vm->_gnap->playShowCurrItem(7, 9, 9, 8);
} else {
switch (_vm->_verbCursor) {
case GRAB_CURSOR:
@@ -911,7 +911,7 @@ void Scene33::run() {
break;
case LOOK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1147,21 +1147,21 @@ void Scene38::run() {
if (_vm->_gnap->_actionStatus == kAS38HoldingHuntingTrophy) {
_vm->_gnap->_actionStatus = kAS38ReleaseHuntingTrophy;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -1205,15 +1205,15 @@ void Scene38::run() {
case kHS38HuntingTrophy:
if (_vm->_gnap->_actionStatus != kAS38HoldingHuntingTrophy) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(3, 6, 2, 0);
+ _vm->_gnap->playShowCurrItem(3, 6, 2, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(0, 0);
+ _vm->_gnap->playScratchingHead(0, 0);
break;
case GRAB_CURSOR:
if (_vm->_plat->_actionStatus == kAS38PlatypusHoldingTrapDoor)
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
else {
_vm->_gnap->walkTo(Common::Point(3, 6), 0, 0x107BB, 1);
_vm->_plat->walkTo(Common::Point(4, 8), -1, -1, 1);
@@ -1221,10 +1221,10 @@ void Scene38::run() {
}
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(2, 0);
+ _vm->_gnap->playBrainPulsating(2, 0);
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1453,21 +1453,21 @@ void Scene39::run() {
case kHS39Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -1487,18 +1487,18 @@ void Scene39::run() {
case kHS39Sign:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS39Sign], 0, -1, 1);
- _vm->playGnapIdle(_vm->_hotspotsWalkPos[kHS39Sign].x, _vm->_hotspotsWalkPos[kHS39Sign].y);
+ _vm->_gnap->playIdle(_vm->_hotspotsWalkPos[kHS39Sign].x, _vm->_hotspotsWalkPos[kHS39Sign].y);
_vm->showFullScreenSprite(0x1C);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 7d7be662dc..2a3458c039 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -76,21 +76,21 @@ void Scene40::run() {
case kHS40Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -351,21 +351,21 @@ void Scene41::run() {
case kHS41Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -399,16 +399,16 @@ void Scene41::run() {
if (_vm->_grabCursorSpriteIndex == kItemDiceQuarterHole) {
_vm->_gnap->_actionStatus = kAS41UseQuarterWithToyVendor;
_vm->_gnap->walkTo(Common::Point(4, 7), 0, 0x107BB, 9);
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 5, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 5, 0);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(4, 7, 5, 0);
+ _vm->_gnap->playShowCurrItem(4, 7, 5, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(5, 0);
+ _vm->_gnap->playMoan1(5, 0);
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -416,7 +416,7 @@ void Scene41::run() {
_vm->_gnap->_actionStatus = kAS41TalkToyVendor;
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -428,11 +428,11 @@ void Scene41::run() {
_vm->_gnap->_idleFacing = kDirUpRight;
_vm->_gnap->_actionStatus = kAS41UseChickenBucketWithKid;
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(7, 7, 8, 0);
+ _vm->_gnap->playShowCurrItem(7, 7, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(9, 0);
+ _vm->_gnap->playScratchingHead(9, 0);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(Common::Point(7, 7), 0, 0x107BB, 1);
@@ -444,7 +444,7 @@ void Scene41::run() {
_vm->_gnap->walkTo(Common::Point(7, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -452,7 +452,7 @@ void Scene41::run() {
case kHS41ToyUfo:
if (_vm->_grabCursorSpriteIndex == kItemGum) {
- _vm->playGnapPullOutDevice(9, 0);
+ _vm->_gnap->playPullOutDevice(9, 0);
gameSys.setAnimation(makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, 0);
_vm->_gnap->_actionStatus = kAS41UseGumWithToyUfo;
}
@@ -580,7 +580,7 @@ void Scene41::updateAnimations() {
break;
case kAS41UseGumWithToyUfo:
gameSys.setAnimation(0, 0, 0);
- _vm->playGnapUseDevice(9, 0);
+ _vm->_gnap->playUseDevice(9, 0);
_vm->_gnap->_actionStatus = -1;
_vm->setGrabCursorSprite(-1);
_vm->invRemove(kItemGum);
@@ -863,21 +863,21 @@ void Scene42::run() {
case kHS42Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -915,11 +915,11 @@ void Scene42::run() {
if (_vm->_plat->_pos.y < 9)
_vm->_plat->walkTo(Common::Point(_vm->_plat->_pos.x, 9), -1, -1, 1);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS42BBQVendor].x, _vm->_hotspotsWalkPos[kHS42BBQVendor].y, _vm->_hotspotsWalkPos[kHS42BBQVendor].x + 1, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS42BBQVendor].x, _vm->_hotspotsWalkPos[kHS42BBQVendor].y, _vm->_hotspotsWalkPos[kHS42BBQVendor].x + 1, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[kHS42BBQVendor].x - 1, 0);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[kHS42BBQVendor].x - 1, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -928,7 +928,7 @@ void Scene42::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -936,11 +936,11 @@ void Scene42::run() {
case kHS42ChickenLeg:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x, _vm->_hotspotsWalkPos[kHS42ChickenLeg].y, _vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x, _vm->_hotspotsWalkPos[kHS42ChickenLeg].y, _vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
+ _vm->_gnap->playScratchingHead(_vm->_hotspotsWalkPos[kHS42ChickenLeg].x - 1, 0);
break;
case GRAB_CURSOR:
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS42ChickenLeg], 0, 0x107BC, 1);
@@ -948,7 +948,7 @@ void Scene42::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1321,21 +1321,21 @@ void Scene43::run() {
case kHS43Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -1368,11 +1368,11 @@ void Scene43::run() {
case kHS43TwoHeadedGuy:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(6, 8, 7, 0);
+ _vm->_gnap->playShowCurrItem(6, 8, 7, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(7, 0);
+ _vm->_gnap->playScratchingHead(7, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1381,7 +1381,7 @@ void Scene43::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1390,11 +1390,11 @@ void Scene43::run() {
case kHS43Key:
case kHS43Ufo:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(3, 7, 2, 0);
+ _vm->_gnap->playShowCurrItem(3, 7, 2, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(0, 0);
+ _vm->_gnap->playScratchingHead(0, 0);
break;
case GRAB_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1403,7 +1403,7 @@ void Scene43::run() {
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1769,21 +1769,21 @@ void Scene44::run() {
case kHS44Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -1816,14 +1816,14 @@ void Scene44::run() {
if (_vm->_grabCursorSpriteIndex >= 0) {
_vm->_gnap->_actionStatus = 2;
_vm->_gnap->walkTo(_vm->_hotspotsWalkPos[kHS44KissingLady], 0, -1, 9);
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, _vm->_hotspotsWalkPos[kHS44KissingLady].x - 1, _vm->_hotspotsWalkPos[kHS44KissingLady].y);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, _vm->_hotspotsWalkPos[kHS44KissingLady].x - 1, _vm->_hotspotsWalkPos[kHS44KissingLady].y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(4, 3);
+ _vm->_gnap->playScratchingHead(4, 3);
break;
case GRAB_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -1835,7 +1835,7 @@ void Scene44::run() {
_vm->_plat->walkTo(Common::Point(6, 7), 1, 0x107D2, 1);
if (_vm->_gnap->_pos == Common::Point(7, 7))
_vm->_gnap->walkStep();
- _vm->playGnapIdle(5, 7);
+ _vm->_gnap->playIdle(5, 7);
_vm->_plat->_actionStatus = 4;
break;
}
@@ -1844,25 +1844,25 @@ void Scene44::run() {
case kHS44Spring:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS44Spring].x, _vm->_hotspotsWalkPos[kHS44Spring].y, 8, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS44Spring].x, _vm->_hotspotsWalkPos[kHS44Spring].y, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(8, 7);
+ _vm->_gnap->playScratchingHead(8, 7);
break;
case GRAB_CURSOR:
- _vm->playGnapPullOutDevice(8, 0);
- _vm->playGnapUseDevice(8, 0);
+ _vm->_gnap->playPullOutDevice(8, 0);
+ _vm->_gnap->playUseDevice(8, 0);
_nextSpringGuySequenceId = 0xFB;
_vm->invAdd(kItemSpring);
_vm->setFlag(kGFSpringTaken);
updateHotspots();
break;
case TALK_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -1870,14 +1870,14 @@ void Scene44::run() {
case kHS44SpringGuy:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS44SpringGuy].x, _vm->_hotspotsWalkPos[kHS44SpringGuy].y, 8, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS44SpringGuy].x, _vm->_hotspotsWalkPos[kHS44SpringGuy].y, 8, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
if (_vm->isFlag(kGFSpringTaken))
- _vm->playGnapMoan1(8, 7);
+ _vm->_gnap->playMoan1(8, 7);
else
- _vm->playGnapScratchingHead(8, 7);
+ _vm->_gnap->playScratchingHead(8, 7);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -1885,7 +1885,7 @@ void Scene44::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2258,11 +2258,11 @@ void Scene45::run() {
case kHS45Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
@@ -2270,11 +2270,11 @@ void Scene45::run() {
gameSys.setAnimation(_vm->_plat->_sequenceId, _vm->_plat->_id, 1);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -2325,16 +2325,16 @@ void Scene45::run() {
_vm->setGrabCursorSprite(-1);
_vm->invRemove(kItemSpring);
} else if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 5, 0);
+ _vm->_gnap->playShowItem(_vm->_grabCursorSpriteIndex, 5, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapScratchingHead(5, 0);
+ _vm->_gnap->playScratchingHead(5, 0);
break;
case GRAB_CURSOR:
case TALK_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2583,21 +2583,21 @@ void Scene46::run() {
case kHS46Platypus:
if (_vm->_gnap->_actionStatus < 0) {
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playMoan1(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
_vm->_gnap->kissPlatypus(0);
break;
case TALK_CURSOR:
- _vm->playGnapBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playBrainPulsating(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
_vm->_plat->playSequence(_vm->_plat->getSequenceId());
break;
case PLAT_CURSOR:
- _vm->playGnapImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
+ _vm->_gnap->playImpossible(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
}
}
@@ -2606,11 +2606,11 @@ void Scene46::run() {
case kHS46SackGuy:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS46SackGuy].x, _vm->_hotspotsWalkPos[kHS46SackGuy].y, 2, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS46SackGuy].x, _vm->_hotspotsWalkPos[kHS46SackGuy].y, 2, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_hotspotsWalkPos[kHS46SackGuy].x + 1, 0);
+ _vm->_gnap->playMoan1(_vm->_hotspotsWalkPos[kHS46SackGuy].x + 1, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
@@ -2619,7 +2619,7 @@ void Scene46::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
@@ -2627,11 +2627,11 @@ void Scene46::run() {
case kHS46ItchyGuy:
if (_vm->_grabCursorSpriteIndex >= 0) {
- _vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x, _vm->_hotspotsWalkPos[kHS46ItchyGuy].y, 7, 0);
+ _vm->_gnap->playShowCurrItem(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x, _vm->_hotspotsWalkPos[kHS46ItchyGuy].y, 7, 0);
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->playGnapMoan1(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x - 1, 0);
+ _vm->_gnap->playMoan1(_vm->_hotspotsWalkPos[kHS46ItchyGuy].x - 1, 0);
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -2640,7 +2640,7 @@ void Scene46::run() {
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- _vm->playGnapImpossible(0, 0);
+ _vm->_gnap->playImpossible(0, 0);
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 11:35:27 +0000