aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/smackerscene.cpp
diff options
context:
space:
mode:
authorjohndoe1232011-09-16 12:23:26 +0000
committerWillem Jan Palenstijn2013-05-08 20:39:38 +0200
commitb757e22f881797f51fa1fb951dd78a88d3ae15d9 (patch)
tree3548fac69f6087e6cd1af1d5a8415de272e0c81a /engines/neverhood/smackerscene.cpp
parenta21f9ef891d32487b0f6a57651aee2d8f7106a40 (diff)
downloadscummvm-rg350-b757e22f881797f51fa1fb951dd78a88d3ae15d9.tar.gz
scummvm-rg350-b757e22f881797f51fa1fb951dd78a88d3ae15d9.tar.bz2
scummvm-rg350-b757e22f881797f51fa1fb951dd78a88d3ae15d9.zip
NEVERHOOD: Multiple changes to make the game logic code cleaner (hopefully :)
- Introduce Scene::insertStaticSprite to create static sprites instead of the old "addSprite(new StaticSprite" (not used everywhere yet) - Introduce macro InsertKlayman to create the Klayman object - Change sendMessage semantics from "receiver->sendMessage(num,arg,sender)" to "sendMessage(receiver,num,arg)", the sender is always the sending object ("this") - Similar changes using macros will follow - And fixed a bug in the elevator
Diffstat (limited to 'engines/neverhood/smackerscene.cpp')
-rw-r--r--engines/neverhood/smackerscene.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/neverhood/smackerscene.cpp b/engines/neverhood/smackerscene.cpp
index ace77f9284..ae290631a9 100644
--- a/engines/neverhood/smackerscene.cpp
+++ b/engines/neverhood/smackerscene.cpp
@@ -73,7 +73,7 @@ void SmackerScene::nextVideo() {
uint32 smackerFileHash = _fileHashList[_fileHashListIndex];
if (_vm->_res->getResourceTypeByHash(smackerFileHash) != 10) {
// Not a Smacker file
- _parentModule->sendMessage(0x1009, 0, this);
+ sendMessage(_parentModule, 0x1009, 0);
return;
}
_fieldDF = getSubVar(0x00800410, smackerFileHash);
@@ -89,7 +89,7 @@ void SmackerScene::nextVideo() {
_smackerPlayer->open(smackerFileHash, false);
}
} else {
- _parentModule->sendMessage(0x1009, 0, this);
+ sendMessage(_parentModule, 0x1009, 0);
}
}
@@ -111,7 +111,7 @@ uint32 SmackerScene::handleMessage(int messageNum, const MessageParam &param, En
break;
case 0x000C:
if (_canAbort) {
- _parentModule->sendMessage(0x1009, 0, this);
+ sendMessage(_parentModule, 0x1009, 0);
}
break;
case 0x3002: