aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/diskplayerscene.cpp
diff options
context:
space:
mode:
authorjohndoe1232013-01-10 22:52:46 +0000
committerWillem Jan Palenstijn2013-05-08 20:47:39 +0200
commit4b7ad48ca8857fd0c597ae1cc1ce599a3286bd57 (patch)
treefd270ee041d4bd061bb7ffafc51b50d333e4d565 /engines/neverhood/diskplayerscene.cpp
parentfec1d7816a3e9924db7eb617eda1a6f3fd7b8978 (diff)
downloadscummvm-rg350-4b7ad48ca8857fd0c597ae1cc1ce599a3286bd57.tar.gz
scummvm-rg350-4b7ad48ca8857fd0c597ae1cc1ce599a3286bd57.tar.bz2
scummvm-rg350-4b7ad48ca8857fd0c597ae1cc1ce599a3286bd57.zip
NEVERHOOD: Rename some CollisionMan methods/fields
- Remove fallback detector (I think it's not needed) - Rename Scene insertMouse methods
Diffstat (limited to 'engines/neverhood/diskplayerscene.cpp')
-rw-r--r--engines/neverhood/diskplayerscene.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp
index d6d4de1a68..fbef6006d5 100644
--- a/engines/neverhood/diskplayerscene.cpp
+++ b/engines/neverhood/diskplayerscene.cpp
@@ -325,7 +325,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int
setPalette(kDiskplayerPaletteFileHashes[paletteIndex]);
_ssPlayButton = insertSprite<DiskplayerPlayButton>(this);
- _vm->_collisionMan->addSprite(_ssPlayButton);
+ _vm->_collisionMan->addCollisionSprite(_ssPlayButton);
_asKey = insertSprite<AsDiskplayerSceneKey>();
@@ -351,7 +351,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int
_finalDiskSlot = new DiskplayerSlot(_vm, this, 20, 0);
addEntity(_finalDiskSlot);
- insertMouse435(0x000408A8, 20, 620);
+ insertPuzzleMouse(0x000408A8, 20, 620);
showMouse(false);
_diskSmackerPlayer = new SmackerPlayer(_vm, this, 0x08288103, false, true);
@@ -442,7 +442,6 @@ void DiskplayerScene::update() {
}
uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
- uint32 messageResult = 0;
Scene::handleMessage(messageNum, param, sender);
if (!_inputDisabled) {
switch (messageNum) {
@@ -473,7 +472,7 @@ uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam &param,
break;
}
}
- return messageResult;
+ return 0;
}
void DiskplayerScene::stop() {