aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/gnap/gnap.h9
-rw-r--r--engines/gnap/scenes/scene43.cpp468
-rw-r--r--engines/gnap/scenes/scene43.h50
-rw-r--r--engines/gnap/scenes/scenecore.cpp9
4 files changed, 291 insertions, 245 deletions
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index 7be814ddd2..3f6e932756 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -612,15 +612,6 @@ public:
bool toyUfoCheckTimer();
void toyUfoFlyTo(int destX, int destY, int minX, int maxX, int minY, int maxY, int animationIndex);
- // Scene 43
- int _s43_currTwoHeadedGuySequenceId;
- int _s43_nextTwoHeadedGuySequenceId;
-
- int scene43_init();
- void scene43_updateHotspots();
- void scene43_run();
- void scene43_updateAnimations();
-
// Scene 44
int _s44_nextSpringGuySequenceId;
int _s44_nextKissingLadySequenceId;
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index 5f74dfae35..9c7b56aabf 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -23,6 +23,7 @@
#include "gnap/gnap.h"
#include "gnap/gamesys.h"
#include "gnap/resource.h"
+#include "gnap/scenes/scene43.h"
namespace Gnap {
@@ -47,183 +48,185 @@ enum {
kHSUfoDevice = 5
};
-int GnapEngine::scene43_init() {
- _gameSys->setAnimation(0, 0, 0);
- _gameSys->setAnimation(0, 0, 1);
- _gameSys->setAnimation(0, 0, 2);
+Scene43::Scene43(GnapEngine *vm) : Scene(vm) {
+ _s43_currTwoHeadedGuySequenceId = -1;
+ _s43_nextTwoHeadedGuySequenceId = -1;
+}
+
+int Scene43::init() {
+ _vm->_gameSys->setAnimation(0, 0, 0);
+ _vm->_gameSys->setAnimation(0, 0, 1);
+ _vm->_gameSys->setAnimation(0, 0, 2);
return 0x13F;
}
-void GnapEngine::scene43_updateHotspots() {
- if (isFlag(kGFGnapControlsToyUFO)) {
- setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_DISABLED);
- setHotspot(kHSUfoExitLeft, 0, 0, 10, 599, SF_EXIT_L_CURSOR);
- setHotspot(kHSUfoExitRight, 790, 0, 799, 599, SF_EXIT_R_CURSOR);
- setHotspot(kHSUfoKey, 140, 170, 185, 260, SF_GRAB_CURSOR);
- setHotspot(kHSUfoBucket, 475, 290, 545, 365, SF_DISABLED);
- setDeviceHotspot(kHSUfoDevice, -1, 534, -1, 599);
- if (isFlag(kGFGroceryStoreHatTaken))
- _hotspots[kHSUfoBucket]._flags = SF_GRAB_CURSOR;
+void Scene43::updateHotspots() {
+ if (_vm->isFlag(kGFGnapControlsToyUFO)) {
+ _vm->setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_DISABLED);
+ _vm->setHotspot(kHSUfoExitLeft, 0, 0, 10, 599, SF_EXIT_L_CURSOR);
+ _vm->setHotspot(kHSUfoExitRight, 790, 0, 799, 599, SF_EXIT_R_CURSOR);
+ _vm->setHotspot(kHSUfoKey, 140, 170, 185, 260, SF_GRAB_CURSOR);
+ _vm->setHotspot(kHSUfoBucket, 475, 290, 545, 365, SF_DISABLED);
+ _vm->setDeviceHotspot(kHSUfoDevice, -1, 534, -1, 599);
+ if (_vm->isFlag(kGFGroceryStoreHatTaken))
+ _vm->_hotspots[kHSUfoBucket]._flags = SF_GRAB_CURSOR;
// NOTE Bug in the original. Key hotspot wasn't disabled.
- if (isFlag(kGFUnk14))
- _hotspots[kHSUfoKey]._flags = SF_DISABLED;
- _hotspotsCount = 6;
+ if (_vm->isFlag(kGFUnk14))
+ _vm->_hotspots[kHSUfoKey]._flags = SF_DISABLED;
+ _vm->_hotspotsCount = 6;
} else {
- setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
- setHotspot(kHSExitUfoParty, 150, 580, 650, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 9);
- setHotspot(kHSExitBBQ, 0, 100, 10, 599, SF_EXIT_L_CURSOR, 0, 8);
- setHotspot(kHSExitKissinBooth, 790, 100, 799, 599, SF_EXIT_R_CURSOR, 10, 8);
- setHotspot(kHSTwoHeadedGuy, 470, 240, 700, 470, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
- setHotspot(kHSKey, 140, 170, 185, 260, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
- setHotspot(kHSUfo, 110, 0, 690, 350, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
- setHotspot(kHSWalkArea1, 0, 0, 800, 445);
- setHotspot(kHSWalkArea2, 465, 0, 800, 493);
- setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
- if (isFlag(kGFUnk14))
- _hotspots[kHSKey]._flags = SF_DISABLED;
- _hotspotsCount = 10;
+ _vm->setHotspot(kHSPlatypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+ _vm->setHotspot(kHSExitUfoParty, 150, 580, 650, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 9);
+ _vm->setHotspot(kHSExitBBQ, 0, 100, 10, 599, SF_EXIT_L_CURSOR, 0, 8);
+ _vm->setHotspot(kHSExitKissinBooth, 790, 100, 799, 599, SF_EXIT_R_CURSOR, 10, 8);
+ _vm->setHotspot(kHSTwoHeadedGuy, 470, 240, 700, 470, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+ _vm->setHotspot(kHSKey, 140, 170, 185, 260, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+ _vm->setHotspot(kHSUfo, 110, 0, 690, 350, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+ _vm->setHotspot(kHSWalkArea1, 0, 0, 800, 445);
+ _vm->setHotspot(kHSWalkArea2, 465, 0, 800, 493);
+ _vm->setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
+ if (_vm->isFlag(kGFUnk14))
+ _vm->_hotspots[kHSKey]._flags = SF_DISABLED;
+ _vm->_hotspotsCount = 10;
}
}
-void GnapEngine::scene43_run() {
-
- queueInsertDeviceIcon();
+void Scene43::run() {
+ _vm->queueInsertDeviceIcon();
- if (!isFlag(kGFUnk14))
- _gameSys->insertSequence(0x1086F, 1, 0, 0, kSeqNone, 0, 0, 0);
+ if (!_vm->isFlag(kGFUnk14))
+ _vm->_gameSys->insertSequence(0x1086F, 1, 0, 0, kSeqNone, 0, 0, 0);
_s43_currTwoHeadedGuySequenceId = 0x13C;
_s43_nextTwoHeadedGuySequenceId = -1;
- _gameSys->setAnimation(0x13C, 1, 2);
- _gameSys->insertSequence(_s43_currTwoHeadedGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
+ _vm->_gameSys->setAnimation(0x13C, 1, 2);
+ _vm->_gameSys->insertSequence(_s43_currTwoHeadedGuySequenceId, 1, 0, 0, kSeqNone, 0, 0, 0);
- if (isFlag(kGFGnapControlsToyUFO)) {
- _toyUfoId = 0;
- _toyUfoActionStatus = -1;
- _toyUfoSequenceId = toyUfoGetSequenceId();
- _toyUfoNextSequenceId = _toyUfoSequenceId;
- if (_prevSceneNum == 42)
- _toyUfoX = 30;
+ if (_vm->isFlag(kGFGnapControlsToyUFO)) {
+ _vm->_toyUfoId = 0;
+ _vm->_toyUfoActionStatus = -1;
+ _vm->_toyUfoSequenceId = _vm->toyUfoGetSequenceId();
+ _vm->_toyUfoNextSequenceId = _vm->_toyUfoSequenceId;
+ if (_vm->_prevSceneNum == 42)
+ _vm->_toyUfoX = 30;
else
- _toyUfoX = 770;
- _gameSys->setAnimation(_toyUfoSequenceId | 0x10000, _toyUfoId, 3);
- _gameSys->insertSequence(_toyUfoSequenceId | 0x10000, _toyUfoId, 0, 0, kSeqNone, 0, _toyUfoX - 274, _toyUfoY - 128);
- endSceneInit();
+ _vm->_toyUfoX = 770;
+ _vm->_gameSys->setAnimation(_vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, 3);
+ _vm->_gameSys->insertSequence(_vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, 0, 0, kSeqNone, 0, _vm->_toyUfoX - 274, _vm->_toyUfoY - 128);
+ _vm->endSceneInit();
} else {
- switch (_prevSceneNum) {
+ switch (_vm->_prevSceneNum) {
case 42:
- initGnapPos(-1, 8, kDirUpRight);
- initPlatypusPos(-1, 9, kDirUpLeft);
- endSceneInit();
- gnapWalkTo(2, 8, -1, 0x107B9, 1);
- platypusWalkTo(1, 8, -1, 0x107C2, 1);
+ _vm->initGnapPos(-1, 8, kDirUpRight);
+ _vm->initPlatypusPos(-1, 9, kDirUpLeft);
+ _vm->endSceneInit();
+ _vm->gnapWalkTo(2, 8, -1, 0x107B9, 1);
+ _vm->platypusWalkTo(1, 8, -1, 0x107C2, 1);
break;
case 44:
- initGnapPos(11, 8, kDirUpRight);
- initPlatypusPos(11, 9, kDirUpLeft);
- endSceneInit();
- gnapWalkTo(8, 8, -1, 0x107BA, 1);
- platypusWalkTo(9, 8, -1, 0x107D2, 1);
+ _vm->initGnapPos(11, 8, kDirUpRight);
+ _vm->initPlatypusPos(11, 9, kDirUpLeft);
+ _vm->endSceneInit();
+ _vm->gnapWalkTo(8, 8, -1, 0x107BA, 1);
+ _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1);
break;
case 54:
- initGnapPos(4, 7, kDirBottomLeft);
- initPlatypusPos(11, 8, kDirUpLeft);
- endSceneInit();
- platypusWalkTo(9, 8, -1, 0x107D2, 1);
+ _vm->initGnapPos(4, 7, kDirBottomLeft);
+ _vm->initPlatypusPos(11, 8, kDirUpLeft);
+ _vm->endSceneInit();
+ _vm->platypusWalkTo(9, 8, -1, 0x107D2, 1);
break;
default:
- initGnapPos(5, 11, kDirUpRight);
- initPlatypusPos(6, 11, kDirUpLeft);
- endSceneInit();
- gnapWalkTo(5, 8, -1, 0x107BA, 1);
- platypusWalkTo(6, 8, -1, 0x107C2, 1);
+ _vm->initGnapPos(5, 11, kDirUpRight);
+ _vm->initPlatypusPos(6, 11, kDirUpLeft);
+ _vm->endSceneInit();
+ _vm->gnapWalkTo(5, 8, -1, 0x107BA, 1);
+ _vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
break;
}
}
- while (!_sceneDone) {
- if (!isSoundPlaying(0x1094B))
- playSound(0x1094B, true);
+ while (!_vm->_sceneDone) {
+ if (!_vm->isSoundPlaying(0x1094B))
+ _vm->playSound(0x1094B, true);
- updateMouseCursor();
- updateCursorByHotspot();
+ _vm->updateMouseCursor();
+ _vm->updateCursorByHotspot();
- testWalk(0, 0, -1, -1, -1, -1);
+ _vm->testWalk(0, 0, -1, -1, -1, -1);
- _sceneClickedHotspot = getClickedHotspotId();
- updateGrabCursorSprite(0, 0);
+ _vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+ _vm->updateGrabCursorSprite(0, 0);
- if (isFlag(kGFGnapControlsToyUFO)) {
-
- switch (_sceneClickedHotspot) {
-
+ if (_vm->isFlag(kGFGnapControlsToyUFO)) {
+ switch (_vm->_sceneClickedHotspot) {
case kHSUfoDevice:
- runMenu();
- scene43_updateHotspots();
- _timers[4] = getRandom(100) + 100;
+ _vm->runMenu();
+ updateHotspots();
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
break;
case kHSUfoExitLeft:
- if (_toyUfoActionStatus < 0) {
- _isLeavingScene = true;
- _toyUfoActionStatus = 4;
- _newSceneNum = 42;
- toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 3);
+ if (_vm->_toyUfoActionStatus < 0) {
+ _vm->_isLeavingScene = true;
+ _vm->_toyUfoActionStatus = 4;
+ _vm->_newSceneNum = 42;
+ _vm->toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 3);
}
break;
case kHSUfoExitRight:
- if (_toyUfoActionStatus < 0) {
- _isLeavingScene = true;
- _toyUfoActionStatus = 4;
- _newSceneNum = 44;
- toyUfoFlyTo(835, -1, 0, 835, 0, 300, 3);
+ if (_vm->_toyUfoActionStatus < 0) {
+ _vm->_isLeavingScene = true;
+ _vm->_toyUfoActionStatus = 4;
+ _vm->_newSceneNum = 44;
+ _vm->toyUfoFlyTo(835, -1, 0, 835, 0, 300, 3);
}
break;
case kHSUfoKey:
- if (isFlag(kGFJointTaken)) {
- _toyUfoActionStatus = 6;
- toyUfoFlyTo(163, 145, 0, 799, 0, 300, 3);
+ if (_vm->isFlag(kGFJointTaken)) {
+ _vm->_toyUfoActionStatus = 6;
+ _vm->toyUfoFlyTo(163, 145, 0, 799, 0, 300, 3);
} else {
- _toyUfoActionStatus = 5;
- toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3);
+ _vm->_toyUfoActionStatus = 5;
+ _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3);
}
break;
case kHSUfoBucket:
- _toyUfoActionStatus = 7;
- toyUfoFlyTo(497, 143, 0, 799, 0, 300, 3);
- _timers[9] = 600;
+ _vm->_toyUfoActionStatus = 7;
+ _vm->toyUfoFlyTo(497, 143, 0, 799, 0, 300, 3);
+ _vm->_timers[9] = 600;
break;
}
} else {
- switch (_sceneClickedHotspot) {
+ switch (_vm->_sceneClickedHotspot) {
case kHSDevice:
- runMenu();
- scene43_updateHotspots();
- _timers[4] = getRandom(100) + 100;
+ _vm->runMenu();
+ updateHotspots();
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
break;
case kHSPlatypus:
- if (_gnapActionStatus < 0) {
- if (_grabCursorSpriteIndex >= 0) {
- playGnapImpossible(_platX, _platY);
+ if (_vm->_gnapActionStatus < 0) {
+ if (_vm->_grabCursorSpriteIndex >= 0) {
+ _vm->playGnapImpossible(_vm->_platX, _vm->_platY);
} else {
- switch (_verbCursor) {
+ switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- playGnapMoan1(_platX, _platY);
+ _vm->playGnapMoan1(_vm->_platX, _vm->_platY);
break;
case GRAB_CURSOR:
- gnapKissPlatypus(0);
+ _vm->gnapKissPlatypus(0);
break;
case TALK_CURSOR:
- playGnapBrainPulsating(_platX, _platY);
- playPlatypusSequence(getPlatypusSequenceId());
+ _vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+ _vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
break;
case PLAT_CURSOR:
- playGnapImpossible(_platX, _platY);
+ _vm->playGnapImpossible(_vm->_platX, _vm->_platY);
break;
}
}
@@ -231,45 +234,45 @@ void GnapEngine::scene43_run() {
break;
case kHSExitUfoParty:
- _isLeavingScene = true;
- gnapWalkTo(_hotspotsWalkPos[kHSExitUfoParty].x, _hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
- _gnapActionStatus = 0;
- platypusWalkTo(_hotspotsWalkPos[kHSExitUfoParty].x, _hotspotsWalkPos[kHSExitUfoParty].y, -1, 0x107C7, 1);
- _newSceneNum = 40;
+ _vm->_isLeavingScene = true;
+ _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHSExitUfoParty].x, _vm->_hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
+ _vm->_gnapActionStatus = 0;
+ _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHSExitUfoParty].x, _vm->_hotspotsWalkPos[kHSExitUfoParty].y, -1, 0x107C7, 1);
+ _vm->_newSceneNum = 40;
break;
case kHSExitBBQ:
- _isLeavingScene = true;
- gnapWalkTo(_hotspotsWalkPos[kHSExitBBQ].x, _gnapY, 0, 0x107AF, 1);
- _gnapActionStatus = 0;
- platypusWalkTo(_hotspotsWalkPos[kHSExitBBQ].x, _hotspotsWalkPos[kHSExitBBQ].y, -1, 0x107CF, 1);
- _newSceneNum = 42;
+ _vm->_isLeavingScene = true;
+ _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHSExitBBQ].x, _vm->_gnapY, 0, 0x107AF, 1);
+ _vm->_gnapActionStatus = 0;
+ _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHSExitBBQ].x, _vm->_hotspotsWalkPos[kHSExitBBQ].y, -1, 0x107CF, 1);
+ _vm->_newSceneNum = 42;
break;
case kHSExitKissinBooth:
- _isLeavingScene = true;
- gnapWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _gnapY, 0, 0x107AB, 1);
- _gnapActionStatus = 0;
- platypusWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _hotspotsWalkPos[kHSExitKissinBooth].y, -1, 0x107CD, 1);
- _newSceneNum = 44;
+ _vm->_isLeavingScene = true;
+ _vm->gnapWalkTo(_vm->_hotspotsWalkPos[kHSExitKissinBooth].x, _vm->_gnapY, 0, 0x107AB, 1);
+ _vm->_gnapActionStatus = 0;
+ _vm->platypusWalkTo(_vm->_hotspotsWalkPos[kHSExitKissinBooth].x, _vm->_hotspotsWalkPos[kHSExitKissinBooth].y, -1, 0x107CD, 1);
+ _vm->_newSceneNum = 44;
break;
case kHSTwoHeadedGuy:
- if (_grabCursorSpriteIndex >= 0) {
- playGnapShowCurrItem(6, 8, 7, 0);
+ if (_vm->_grabCursorSpriteIndex >= 0) {
+ _vm->playGnapShowCurrItem(6, 8, 7, 0);
} else {
- switch (_verbCursor) {
+ switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- playGnapScratchingHead(7, 0);
+ _vm->playGnapScratchingHead(7, 0);
break;
case TALK_CURSOR:
- _gnapIdleFacing = kDirUpRight;
- gnapWalkTo(5, 8, 0, getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
- _gnapActionStatus = 2;
+ _vm->_gnapIdleFacing = kDirUpRight;
+ _vm->gnapWalkTo(5, 8, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+ _vm->_gnapActionStatus = 2;
break;
case GRAB_CURSOR:
case PLAT_CURSOR:
- playGnapImpossible(0, 0);
+ _vm->playGnapImpossible(0, 0);
break;
}
}
@@ -277,21 +280,21 @@ void GnapEngine::scene43_run() {
case kHSKey:
case kHSUfo:
- if (_grabCursorSpriteIndex >= 0) {
- playGnapShowCurrItem(3, 7, 2, 0);
+ if (_vm->_grabCursorSpriteIndex >= 0) {
+ _vm->playGnapShowCurrItem(3, 7, 2, 0);
} else {
- switch (_verbCursor) {
+ switch (_vm->_verbCursor) {
case LOOK_CURSOR:
- playGnapScratchingHead(0, 0);
+ _vm->playGnapScratchingHead(0, 0);
break;
case GRAB_CURSOR:
- _gnapIdleFacing = kDirUpRight;
- gnapWalkTo(3, 7, 0, 67515, 1);
- _gnapActionStatus = 1;
+ _vm->_gnapIdleFacing = kDirUpRight;
+ _vm->gnapWalkTo(3, 7, 0, 67515, 1);
+ _vm->_gnapActionStatus = 1;
break;
case TALK_CURSOR:
case PLAT_CURSOR:
- playGnapImpossible(0, 0);
+ _vm->playGnapImpossible(0, 0);
break;
}
}
@@ -299,35 +302,35 @@ void GnapEngine::scene43_run() {
case kHSWalkArea1:
case kHSWalkArea2:
- if (_gnapActionStatus < 0)
- gnapWalkTo(-1, -1, -1, -1, 1);
+ if (_vm->_gnapActionStatus < 0)
+ _vm->gnapWalkTo(-1, -1, -1, -1, 1);
break;
}
}
- if (_mouseClickState._left && _gnapActionStatus < 0) {
- _mouseClickState._left = false;
- if (isFlag(kGFGnapControlsToyUFO) && (_toyUfoActionStatus == 5 || _toyUfoActionStatus == -1)) {
- _toyUfoActionStatus = 5;
- toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3);
+ if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+ _vm->_mouseClickState._left = false;
+ if (_vm->isFlag(kGFGnapControlsToyUFO) && (_vm->_toyUfoActionStatus == 5 || _vm->_toyUfoActionStatus == -1)) {
+ _vm->_toyUfoActionStatus = 5;
+ _vm->toyUfoFlyTo(-1, -1, 0, 799, 0, 300, 3);
} else {
- gnapWalkTo(-1, -1, -1, -1, 1);
+ _vm->gnapWalkTo(-1, -1, -1, -1, 1);
}
}
- scene43_updateAnimations();
+ updateAnimations();
- toyUfoCheckTimer();
+ _vm->toyUfoCheckTimer();
- if (!_isLeavingScene) {
- if (_platypusActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
- updatePlatypusIdleSequence();
- if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
- updateGnapIdleSequence();
- if (!_timers[4] && (!isFlag(kGFGnapControlsToyUFO) || !isFlag(kGFGroceryStoreHatTaken))) {
- _timers[4] = getRandom(100) + 100;
- if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s43_nextTwoHeadedGuySequenceId == -1) {
- switch (getRandom(5)) {
+ if (!_vm->_isLeavingScene) {
+ if (_vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO))
+ _vm->updatePlatypusIdleSequence();
+ if (_vm->_gnapActionStatus < 0 && !_vm->isFlag(kGFGnapControlsToyUFO))
+ _vm->updateGnapIdleSequence();
+ if (!_vm->_timers[4] && (!_vm->isFlag(kGFGnapControlsToyUFO) || !_vm->isFlag(kGFGroceryStoreHatTaken))) {
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
+ if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _s43_nextTwoHeadedGuySequenceId == -1) {
+ switch (_vm->getRandom(5)) {
case 0:
_s43_nextTwoHeadedGuySequenceId = 0x13C;
break;
@@ -350,127 +353,126 @@ void GnapEngine::scene43_run() {
}
}
- checkGameKeys();
+ _vm->checkGameKeys();
- if (isKeyStatus1(8)) {
- clearKeyStatus1(8);
- runMenu();
- scene43_updateHotspots();
- _timers[4] = getRandom(100) + 100;
+ if (_vm->isKeyStatus1(8)) {
+ _vm->clearKeyStatus1(8);
+ _vm->runMenu();
+ updateHotspots();
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
}
- gameUpdateTick();
+ _vm->gameUpdateTick();
}
- if (_newSceneNum == 54)
- clearFlag(kGFGnapControlsToyUFO);
+ if (_vm->_newSceneNum == 54)
+ _vm->clearFlag(kGFGnapControlsToyUFO);
}
-void GnapEngine::scene43_updateAnimations() {
- if (_gameSys->getAnimationStatus(0) == 2) {
- switch (_gnapActionStatus) {
+void Scene43::updateAnimations() {
+ if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+ switch (_vm->_gnapActionStatus) {
case 0:
- _gameSys->setAnimation(0, 0, 0);
- _sceneDone = true;
+ _vm->_gameSys->setAnimation(0, 0, 0);
+ _vm->_sceneDone = true;
break;
case 1:
- if (_gameSys->getAnimationStatus(2) == 2) {
- _timers[2] = getRandom(30) + 20;
- _timers[3] = getRandom(50) + 200;
- _gameSys->insertSequence(0x13D, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
- _gnapSequenceId = 0x13D;
- _gnapSequenceDatNum = 0;
- _gameSys->setAnimation(0x13D, _gnapId, 0);
+ if (_vm->_gameSys->getAnimationStatus(2) == 2) {
+ _vm->_timers[2] = _vm->getRandom(30) + 20;
+ _vm->_timers[3] = _vm->getRandom(50) + 200;
+ _vm->_gameSys->insertSequence(0x13D, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+ _vm->_gnapSequenceId = 0x13D;
+ _vm->_gnapSequenceDatNum = 0;
+ _vm->_gameSys->setAnimation(0x13D, _vm->_gnapId, 0);
_s43_nextTwoHeadedGuySequenceId = 0x13B;
- _gameSys->insertSequence(0x13B, 1, _s43_currTwoHeadedGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
- _gameSys->setAnimation(_s43_nextTwoHeadedGuySequenceId, 1, 2);
+ _vm->_gameSys->insertSequence(0x13B, 1, _s43_currTwoHeadedGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
+ _vm->_gameSys->setAnimation(_s43_nextTwoHeadedGuySequenceId, 1, 2);
_s43_currTwoHeadedGuySequenceId = _s43_nextTwoHeadedGuySequenceId;
_s43_nextTwoHeadedGuySequenceId = -1;
- _timers[4] = getRandom(100) + 100;
- _gnapActionStatus = -1;
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
+ _vm->_gnapActionStatus = -1;
}
break;
default:
- _gameSys->setAnimation(0, 0, 0);
- _gnapActionStatus = -1;
+ _vm->_gameSys->setAnimation(0, 0, 0);
+ _vm->_gnapActionStatus = -1;
break;
}
}
- if (_gameSys->getAnimationStatus(2) == 2) {
+ if (_vm->_gameSys->getAnimationStatus(2) == 2) {
if (_s43_currTwoHeadedGuySequenceId == 0x13A) {
- if (isFlag(kGFGroceryStoreHatTaken)) {
+ if (_vm->isFlag(kGFGroceryStoreHatTaken)) {
_s43_nextTwoHeadedGuySequenceId = 0x13E;
- stopSound(0x108F6);
- } else if (getRandom(2) != 0) {
+ _vm->stopSound(0x108F6);
+ } else if (_vm->getRandom(2) != 0) {
_s43_nextTwoHeadedGuySequenceId = 0x137;
} else {
_s43_nextTwoHeadedGuySequenceId = 0x138;
}
} else if (_s43_currTwoHeadedGuySequenceId == 0x13E) {
- _sceneDone = true;
- _newSceneNum = 54;
+ _vm->_sceneDone = true;
+ _vm->_newSceneNum = 54;
}
if (_s43_nextTwoHeadedGuySequenceId != -1) {
- _gameSys->insertSequence(_s43_nextTwoHeadedGuySequenceId, 1, _s43_currTwoHeadedGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
- _gameSys->setAnimation(_s43_nextTwoHeadedGuySequenceId, 1, 2);
+ _vm->_gameSys->insertSequence(_s43_nextTwoHeadedGuySequenceId, 1, _s43_currTwoHeadedGuySequenceId, 1, kSeqSyncWait, 0, 0, 0);
+ _vm->_gameSys->setAnimation(_s43_nextTwoHeadedGuySequenceId, 1, 2);
_s43_currTwoHeadedGuySequenceId = _s43_nextTwoHeadedGuySequenceId;
_s43_nextTwoHeadedGuySequenceId = -1;
- _timers[4] = getRandom(100) + 100;
+ _vm->_timers[4] = _vm->getRandom(100) + 100;
}
}
- if (_gameSys->getAnimationStatus(3) == 2) {
- switch (_toyUfoActionStatus) {
+ if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+ switch (_vm->_toyUfoActionStatus) {
case 4:
- _sceneDone = true;
- _toyUfoActionStatus = -1;
+ _vm->_sceneDone = true;
+ _vm->_toyUfoActionStatus = -1;
break;
case 6:
- _gameSys->insertSequence(0x10871, _toyUfoId, _toyUfoSequenceId | 0x10000, _toyUfoId, kSeqSyncWait, 0, 0, 0);
- _gameSys->removeSequence(0x1086F, 1, true);
- setFlag(kGFUnk14);
- scene43_updateHotspots();
- toyUfoSetStatus(kGFUnk18);
- _toyUfoSequenceId = 0x871;
- _gameSys->setAnimation(0x10871, _toyUfoId, 3);
- _toyUfoActionStatus = -1;
- _toyUfoX = 96;
- _toyUfoY = 131;
+ _vm->_gameSys->insertSequence(0x10871, _vm->_toyUfoId, _vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, kSeqSyncWait, 0, 0, 0);
+ _vm->_gameSys->removeSequence(0x1086F, 1, true);
+ _vm->setFlag(kGFUnk14);
+ updateHotspots();
+ _vm->toyUfoSetStatus(kGFUnk18);
+ _vm->_toyUfoSequenceId = 0x871;
+ _vm->_gameSys->setAnimation(0x10871, _vm->_toyUfoId, 3);
+ _vm->_toyUfoActionStatus = -1;
+ _vm->_toyUfoX = 96;
+ _vm->_toyUfoY = 131;
break;
case 7:
- _gameSys->insertSequence(0x10874, _toyUfoId, _toyUfoSequenceId | 0x10000, _toyUfoId, kSeqSyncWait, 0, 0, 0);
- _toyUfoSequenceId = 0x874;
- _gameSys->setAnimation(0x10874, _toyUfoId, 3);
- _toyUfoActionStatus = 8;
- setFlag(kGFJointTaken);
- _gnapActionStatus = 3;
+ _vm->_gameSys->insertSequence(0x10874, _vm->_toyUfoId, _vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId, kSeqSyncWait, 0, 0, 0);
+ _vm->_toyUfoSequenceId = 0x874;
+ _vm->_gameSys->setAnimation(0x10874, _vm->_toyUfoId, 3);
+ _vm->_toyUfoActionStatus = 8;
+ _vm->setFlag(kGFJointTaken);
+ _vm->_gnapActionStatus = 3;
break;
case 8:
_s43_nextTwoHeadedGuySequenceId = 0x13A;
- _toyUfoX = 514;
- _toyUfoY = 125;
- toyUfoFlyTo(835, 125, 0, 835, 0, 300, 3);
- _toyUfoActionStatus = 9;
+ _vm->_toyUfoX = 514;
+ _vm->_toyUfoY = 125;
+ _vm->toyUfoFlyTo(835, 125, 0, 835, 0, 300, 3);
+ _vm->_toyUfoActionStatus = 9;
break;
case 9:
// Nothing
break;
default:
- _toyUfoNextSequenceId = toyUfoGetSequenceId();
- _gameSys->insertSequence(_toyUfoNextSequenceId | 0x10000, _toyUfoId + 1,
- _toyUfoSequenceId | 0x10000, _toyUfoId,
- kSeqSyncWait, 0, _toyUfoX - 274, _toyUfoY - 128);
- _toyUfoSequenceId = _toyUfoNextSequenceId;
- ++_toyUfoId;
- _gameSys->setAnimation(_toyUfoNextSequenceId | 0x10000, _toyUfoId, 3);
- _toyUfoActionStatus = -1;
+ _vm->_toyUfoNextSequenceId = _vm->toyUfoGetSequenceId();
+ _vm->_gameSys->insertSequence(_vm->_toyUfoNextSequenceId | 0x10000, _vm->_toyUfoId + 1,
+ _vm->_toyUfoSequenceId | 0x10000, _vm->_toyUfoId,
+ kSeqSyncWait, 0, _vm->_toyUfoX - 274, _vm->_toyUfoY - 128);
+ _vm->_toyUfoSequenceId = _vm->_toyUfoNextSequenceId;
+ ++_vm->_toyUfoId;
+ _vm->_gameSys->setAnimation(_vm->_toyUfoNextSequenceId | 0x10000, _vm->_toyUfoId, 3);
+ _vm->_toyUfoActionStatus = -1;
break;
}
}
-
}
} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene43.h b/engines/gnap/scenes/scene43.h
new file mode 100644
index 0000000000..427d18bdae
--- /dev/null
+++ b/engines/gnap/scenes/scene43.h
@@ -0,0 +1,50 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GNAP_SCENE43_H
+#define GNAP_SCENE43_H
+
+#include "gnap/debugger.h"
+#include "gnap/scenes/scenecore.h"
+
+namespace Gnap {
+
+class GnapEngine;
+
+class Scene43: public Scene {
+public:
+ Scene43(GnapEngine *vm);
+ ~Scene43() {}
+
+ virtual int init();
+ virtual void updateHotspots();
+ virtual void run();
+ virtual void updateAnimations();
+ virtual void updateAnimationsCb() {};
+
+private:
+ int _s43_currTwoHeadedGuySequenceId;
+ int _s43_nextTwoHeadedGuySequenceId;
+};
+
+} // End of namespace Gnap
+#endif // GNAP_SCENE43_H
diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index 029fb9c845..17ec6b035c 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -64,6 +64,7 @@
#include "gnap/scenes/scene40.h"
#include "gnap/scenes/scene41.h"
#include "gnap/scenes/scene42.h"
+#include "gnap/scenes/scene43.h"
#include "gnap/scenes/scene47.h"
#include "gnap/scenes/scene48.h"
#include "gnap/scenes/scene54.h"
@@ -372,8 +373,9 @@ int GnapEngine::initSceneLogic() {
initSceneGrid(21, 146, 11, 10);
break;
case 43:
- backgroundId = scene43_init();
- scene43_updateHotspots();
+ _scene = new Scene43(this);
+ backgroundId = _scene->init();
+ _scene->updateHotspots();
_gameSys->setScaleValues(0, 500, 1, 1000);
initSceneGrid(21, 146, 11, 10);
break;
@@ -690,7 +692,8 @@ void GnapEngine::runSceneLogic() {
_newSceneNum = 37;
break;
case 43:
- scene43_run();
+ _scene->run();
+ delete _scene;
if (_newSceneNum == 55)
_newSceneNum = 37;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 00:44:01 +0000