aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap/scenes
diff options
context:
space:
mode:
authorStrangerke2016-05-07 22:59:59 +0200
committerEugene Sandulenko2016-05-10 12:14:54 +0200
commit8a725082a512d080ff394ee38370c96c6f13ec0b (patch)
treeaf8a9e258bfda3fb20d7ea511c361c42a69612d3 /engines/gnap/scenes
parent951fab48530ab6b411ce396f459bf66d120ce05d (diff)
downloadscummvm-rg350-8a725082a512d080ff394ee38370c96c6f13ec0b.tar.gz
scummvm-rg350-8a725082a512d080ff394ee38370c96c6f13ec0b.tar.bz2
scummvm-rg350-8a725082a512d080ff394ee38370c96c6f13ec0b.zip
GNAP: Move more functions to PlayerGnap
Diffstat (limited to 'engines/gnap/scenes')
-rw-r--r--engines/gnap/scenes/group0.cpp28
-rw-r--r--engines/gnap/scenes/group1.cpp26
2 files changed, 27 insertions, 27 deletions
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index c16a1e7f45..d65558474c 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -2833,7 +2833,7 @@ void Scene07::run() {
}
} else {
_vm->_timers[0] = _vm->getRandom(75) + 75;
- _vm->platypusMakeRoom();
+ _vm->_plat->makeRoom();
}
} else {
_vm->_timers[0] = 100;
@@ -2995,7 +2995,7 @@ void Scene08::run() {
_vm->playGnapScratchingHead(_vm->_plat->_pos.x, _vm->_plat->_pos.y);
break;
case GRAB_CURSOR:
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->kissPlatypus(8);
break;
case TALK_CURSOR:
@@ -3010,7 +3010,7 @@ void Scene08::run() {
case kHS08ExitBackdoor:
_vm->_isLeavingScene = true;
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(0, 6), 0, 0x107AF, 1);
_vm->_gnap->_actionStatus = kAS08LeaveScene;
_vm->_plat->walkTo(Common::Point(0, 7), 1, 0x107CF, 1);
@@ -3019,7 +3019,7 @@ void Scene08::run() {
case kHS08ExitCrash:
_vm->_isLeavingScene = true;
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(3, 9), 0, 0x107AE, 1);
_vm->_gnap->_actionStatus = kAS08LeaveScene;
_vm->_plat->walkTo(Common::Point(4, 9), 1, 0x107C1, 1);
@@ -3032,7 +3032,7 @@ void Scene08::run() {
} else {
switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(6, 6), 0, 0x107BB, 1);
_vm->_gnap->_actionStatus = kAS08LookMan;
_vm->_gnap->_idleFacing = kDirUpRight;
@@ -3042,12 +3042,12 @@ void Scene08::run() {
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpLeft;
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(8, 6), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS08TalkMan;
break;
case PLAT_CURSOR:
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->useDeviceOnPlatypus();
_vm->_plat->walkTo(Common::Point(6, 6), 1, 0x107C2, 1);
_vm->_plat->_actionStatus = kAS08PlatWithMan;
@@ -3077,13 +3077,13 @@ void Scene08::run() {
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(4, 7), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS08TalkDog;
break;
case PLAT_CURSOR:
_vm->setFlag(kGFSceneFlag1);
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->useDeviceOnPlatypus();
_vm->_plat->walkTo(Common::Point(3, 7), 1, 0x107C2, 1);
_vm->_plat->_actionStatus = kAS08PlatWithDog;
@@ -3106,7 +3106,7 @@ void Scene08::run() {
if (_currDogSequenceId == 0x135) {
_vm->playGnapScratchingHead(6, 7);
} else {
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->playGnapPullOutDevice(6, 7);
_vm->playGnapUseDevice(0, 0);
_nextDogSequenceId = 0x149;
@@ -3132,7 +3132,7 @@ void Scene08::run() {
if (_currDogSequenceId == 0x135) {
_vm->playGnapScratchingHead(3, 6);
} else {
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->playGnapPullOutDevice(3, 6);
_vm->playGnapUseDevice(0, 0);
_nextDogSequenceId = 0x14A;
@@ -3158,7 +3158,7 @@ void Scene08::run() {
if (_currDogSequenceId == 0x135) {
_vm->playGnapScratchingHead(7, 6);
} else {
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->playGnapPullOutDevice(7, 6);
_vm->playGnapUseDevice(0, 0);
_nextDogSequenceId = 0x14B;
@@ -3174,13 +3174,13 @@ void Scene08::run() {
case kHS08WalkArea1:
case kHS08WalkArea2:
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(-1, 6), -1, -1, 1);
break;
default:
if (_vm->_mouseClickState._left) {
- _vm->gnapActionIdle(0x14D);
+ _vm->_gnap->actionIdle(0x14D);
_vm->_gnap->walkTo(Common::Point(-1, -1), -1, -1, 1);
_vm->_mouseClickState._left = false;
}
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 9033763c7e..8a6bff0fcf 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -131,7 +131,7 @@ void Scene10::run() {
case kHS10ExitBar:
_vm->_isLeavingScene = true;
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(0, 7), 0, 0x107AF, 1);
_vm->_gnap->_actionStatus = kAS10LeaveScene;
_vm->_plat->walkTo(Common::Point(0, 7), -1, 0x107CF, 1);
@@ -140,7 +140,7 @@ void Scene10::run() {
case kHS10ExitBackdoor:
_vm->_isLeavingScene = true;
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(2, 9), 0, 0x107AE, 1);
_vm->_gnap->_actionStatus = kAS10LeaveScene;
_vm->_plat->walkTo(Common::Point(3, 9), -1, 0x107C7, 1);
@@ -163,12 +163,12 @@ void Scene10::run() {
break;
case TALK_CURSOR:
_vm->_gnap->_idleFacing = kDirUpRight;
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, _vm->_gnap->getSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
_vm->_gnap->_actionStatus = kAS10AnnoyCook;
break;
case PLAT_CURSOR:
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->useDeviceOnPlatypus();
_vm->_plat->walkTo(Common::Point(4, 6), -1, -1, 1);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
@@ -193,7 +193,7 @@ void Scene10::run() {
if (_vm->isFlag(kGFMudTaken))
_vm->playGnapMoan2(-1, -1);
else {
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
_vm->_gnap->_actionStatus = kAS10AnnoyCook;
}
@@ -205,7 +205,7 @@ void Scene10::run() {
if (_vm->isFlag(kGFMudTaken))
_vm->playGnapMoan2(-1, -1);
else {
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->useDeviceOnPlatypus();
_vm->_plat->walkTo(Common::Point(3, 7), -1, -1, 1);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
@@ -225,7 +225,7 @@ void Scene10::run() {
_vm->playGnapScratchingHead(7, 3);
break;
case GRAB_CURSOR:
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(4, 8), 0, 0x107BB, 1);
_vm->_gnap->_actionStatus = kAS10AnnoyCook;
break;
@@ -238,7 +238,7 @@ void Scene10::run() {
else {
_vm->invAdd(kItemTongs);
_vm->setFlag(kGFMudTaken);
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->useDeviceOnPlatypus();
_vm->_plat->walkTo(Common::Point(7, 6), 1, 0x107D2, 1);
_vm->_plat->_actionStatus = kAS10PlatWithBox;
@@ -260,7 +260,7 @@ void Scene10::run() {
_vm->_gnap->playSequence(_vm->_gnap->getSequenceId(gskDeflect, 10, 5) | 0x10000);
break;
case GRAB_CURSOR:
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(9, 6), 0, 0x107BB, 1);
gameSys.insertSequence(0x10E, 120, makeRid(_vm->_gnap->_sequenceDatNum, _vm->_gnap->_sequenceId), _vm->_gnap->_id, kSeqSyncWait, 0, 0, 0);
_vm->_gnap->_sequenceId = 0x10E;
@@ -282,7 +282,7 @@ void Scene10::run() {
case kHS10WalkArea2:
case kHS10WalkArea3:
case kHS10WalkArea4:
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(-1, -1), -1, -1, 1);
break;
@@ -295,7 +295,7 @@ void Scene10::run() {
default:
if (_vm->_mouseClickState._left) {
- _vm->gnapActionIdle(0x10C);
+ _vm->_gnap->actionIdle(0x10C);
_vm->_gnap->walkTo(Common::Point(-1, -1), -1, -1, 1);
_vm->_mouseClickState._left = false;
}
@@ -3185,9 +3185,9 @@ void Scene18::gnapCarryGarbageCanTo(int gridX) {
if (_vm->_gnap->_pos.y == _vm->_plat->_pos.y) {
if (nextGridX >= _vm->_gnap->_pos.x) {
if (nextGridX >= _vm->_plat->_pos.x && _vm->_gnap->_pos.x <= _vm->_plat->_pos.x)
- _vm->platypusMakeRoom();
+ _vm->_plat->makeRoom();
} else if (nextGridX <= _vm->_plat->_pos.x && _vm->_gnap->_pos.x >= _vm->_plat->_pos.x) {
- _vm->platypusMakeRoom();
+ _vm->_plat->makeRoom();
}
}
gnapSeqId = _vm->_gnap->_sequenceId;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 13:59:37 +0000