aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/module1300.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/neverhood/module1300.cpp')
-rw-r--r--engines/neverhood/module1300.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp
index 989ada535d..a0a1167748 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/module1300.cpp
@@ -419,7 +419,7 @@ void SsScene1302Fence::suMoveUp() {
}
Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which)
- : Scene(vm, parentModule, true) {
+ : Scene(vm, parentModule) {
SetMessageHandler(&Scene1302::handleMessage);
@@ -456,7 +456,7 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which)
_klayman->setClipRect(0, 0, _sprite3->getDrawRect().x2(), 480);
_asVenusFlyTrap = insertSprite<AsScene1002VenusFlyTrap>(this, _klayman, true);
- _vm->_collisionMan->addCollisionSprite(_asVenusFlyTrap);
+ addCollisionSprite(_asVenusFlyTrap);
sendEntityMessage(_klayman, 0x2007, _asVenusFlyTrap);
@@ -630,7 +630,7 @@ void AsScene1303Balloon::stPopBalloon() {
}
Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule)
- : Scene(vm, parentModule, true) {
+ : Scene(vm, parentModule) {
SetMessageHandler(&Scene1303::handleMessage);
@@ -641,7 +641,7 @@ Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule)
if (!getGlobalVar(V_BALLOON_POPPED)) {
_asBalloon = insertSprite<AsScene1303Balloon>(this);
- _vm->_collisionMan->addCollisionSprite(_asBalloon);
+ addCollisionSprite(_asBalloon);
}
_sprite1 = insertStaticSprite(0xA014216B, 1100);
@@ -692,7 +692,7 @@ uint32 AsScene1304Needle::handleMessage(int messageNum, const MessageParam &para
}
Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which)
- : Scene(vm, parentModule, true), _asNeedle(NULL) {
+ : Scene(vm, parentModule), _asNeedle(NULL) {
SetMessageHandler(&Scene1304::handleMessage);
@@ -703,14 +703,14 @@ Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which)
if (getGlobalVar(V_BALLOON_POPPED)) {
_asKey = insertSprite<AsCommonKey>(this, 0, 1100, 278, 347);
- _vm->_collisionMan->addCollisionSprite(_asKey);
+ addCollisionSprite(_asKey);
} else {
_asKey = insertSprite<AnimatedSprite>(0x80106018, 100, 279, 48);
}
if (!getGlobalVar(V_HAS_NEEDLE)) {
_asNeedle = insertSprite<AsScene1304Needle>(this, 1100, 278, 347);
- _vm->_collisionMan->addCollisionSprite(_asNeedle);
+ addCollisionSprite(_asNeedle);
}
_sprite1 = insertStaticSprite(0x0562E621, 1100);
@@ -756,7 +756,7 @@ uint32 Scene1304::handleMessage(int messageNum, const MessageParam &param, Entit
}
Scene1305::Scene1305(NeverhoodEngine *vm, Module *parentModule, int which)
- : Scene(vm, parentModule, true) {
+ : Scene(vm, parentModule) {
SetMessageHandler(&Scene1305::handleMessage);
@@ -867,7 +867,7 @@ void AsScene1306Elevator::cbGoingDownEvent() {
}
Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
- : Scene(vm, parentModule, true) {
+ : Scene(vm, parentModule) {
if (getGlobalVar(V_HAS_FINAL_KEY) && getGlobalVar(V_KEY3_LOCATION) == 0)
setGlobalVar(V_KEY3_LOCATION, 4);
@@ -880,7 +880,7 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
if (getGlobalVar(V_KEY3_LOCATION) == 4) {
_asKey = insertSprite<AsCommonKey>(this, 2, 1100, 435, 445);
- _vm->_collisionMan->addCollisionSprite(_asKey);
+ addCollisionSprite(_asKey);
}
_ssButton = insertSprite<SsCommonButtonSprite>(this, 0x404A36A0, 100, 0x440C1000);
@@ -897,14 +897,14 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
insertKlayman<KmScene1306>(380, 440);
setMessageList(0x004AFAD0);
sendMessage(this, 0x2000, 0);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else if (which == 1) {
// Klaymen teleporting in
insertKlayman<KmScene1306>(136, 440);
sendMessage(_klayman, 0x2000, 1);
setMessageList(0x004AFAF0);
sendMessage(this, 0x2000, 1);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else if (which == 2) {
// Klaymen returning from diskplayer
if (getGlobalVar(V_KLAYMAN_IS_DELTA_X)) {
@@ -915,27 +915,27 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which)
}
setMessageList(0x004AFBC8);
sendMessage(this, 0x2000, 0);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else if (which == 3) {
// Klaymen returning from window
insertKlayman<KmScene1306>(534, 440);
setMessageList(0x004AFC30);
sendMessage(this, 0x2000, 0);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else if (which == 4) {
// Klaymen teleporting out
insertKlayman<KmScene1306>(136, 440);
sendMessage(_klayman, 0x2000, 1);
setMessageList(0x004AFC38);
sendMessage(this, 0x2000, 1);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else if (which == 5) {
// Klaymen returning from teleporter
insertKlayman<KmScene1306>(136, 440);
sendMessage(_klayman, 0x2000, 1);
setMessageList(0x004AFB00);
sendMessage(this, 0x2000, 1);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
} else {
// Klaymen coming up in elevator
insertKlayman<KmScene1306>(286, 408);
@@ -1007,7 +1007,7 @@ uint32 Scene1306::handleMessage(int messageNum, const MessageParam &param, Entit
setSurfacePriority(_asElevatorDoor->getSurface(), 90);
setSurfacePriority(_sprite1->getSurface(), 80);
sendMessage(this, 0x2000, 0);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
break;
}
return 0;
@@ -1033,7 +1033,7 @@ uint32 Scene1306::handleMessage416EB0(int messageNum, const MessageParam &param,
setSurfacePriority(_asElevatorDoor->getSurface(), 90);
setSurfacePriority(_sprite1->getSurface(), 80);
sendMessage(this, 0x2000, 0);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
break;
}
return 0;
@@ -1222,7 +1222,7 @@ void AsScene1307Key::stInsert() {
}
Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule)
- : Scene(vm, parentModule, true), _countdown(0), _asCurrKey(NULL),
+ : Scene(vm, parentModule), _countdown(0), _asCurrKey(NULL),
_isInsertingKey(false), _doLeaveScene(false), _isPuzzleSolved(false) {
Sprite *tempSprite;
@@ -1260,7 +1260,7 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule)
for (uint keyIndex = 0; keyIndex < 3; keyIndex++) {
if (getSubVar(VA_IS_KEY_INSERTED, keyIndex)) {
_asKeys[keyIndex] = insertSprite<AsScene1307Key>(this, keyIndex, _clipRects);
- _vm->_collisionMan->addCollisionSprite(_asKeys[keyIndex]);
+ addCollisionSprite(_asKeys[keyIndex]);
} else {
_asKeys[keyIndex] = NULL;
}
@@ -1519,7 +1519,7 @@ uint32 AsScene1308Mouse::handleMessage(int messageNum, const MessageParam &param
}
Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
- : Scene(vm, parentModule, true), _isProjecting(false), _asProjector(NULL) {
+ : Scene(vm, parentModule), _isProjecting(false), _asProjector(NULL) {
_vm->gameModule()->initKeySlotsPuzzle();
@@ -1530,7 +1530,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
insertScreenMouse(0x24206418);
_asTape = insertSprite<AsScene1201Tape>(this, 17, 1100, 502, 445, 0x9148A011);
- _vm->_collisionMan->addCollisionSprite(_asTape);
+ addCollisionSprite(_asTape);
if (getGlobalVar(V_MOUSE_SUCKED_IN)) {
insertSprite<AsScene1308Mouse>();
@@ -1603,7 +1603,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which)
if (getGlobalVar(V_PROJECTOR_LOCATION) == 4) {
_asProjector = insertSprite<AsCommonProjector>(this, _klayman, (Sprite*)NULL);
- _vm->_collisionMan->addCollisionSprite(_asProjector);
+ addCollisionSprite(_asProjector);
_asProjector->setClipRect(0, 0, 640, _sprite2->getDrawRect().y2());
_asProjector->setRepl(64, 0);
}
@@ -1697,7 +1697,7 @@ uint32 Scene1308::handleMessage(int messageNum, const MessageParam &param, Entit
}
Scene1317::Scene1317(NeverhoodEngine *vm, Module *parentModule)
- : Scene(vm, parentModule, true) {
+ : Scene(vm, parentModule) {
SetMessageHandler(&Scene1317::handleMessage);
_smackerPlayer = addSmackerPlayer(new SmackerPlayer(_vm, this, 0x08982841, true, false));
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 17:25:54 +0000