aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/messagehandlers.cpp
diff options
context:
space:
mode:
authorKamil Zbróg2014-01-07 00:13:05 +0000
committerKamil Zbróg2014-01-07 00:13:05 +0000
commite94fabc37407a7d300af04493b0f5cbced42a092 (patch)
tree998bfaa03109a49d2bb9ec5b17e817ef7cc32a4c /engines/fullpipe/messagehandlers.cpp
parent165b8be77f4621ff5de8a483c6cd9ac497492a0a (diff)
parent4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (diff)
downloadscummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.gz
scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.bz2
scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.zip
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/fullpipe/messagehandlers.cpp')
-rw-r--r--engines/fullpipe/messagehandlers.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index a9872a5a23..44a3e4cb60 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -42,7 +42,7 @@ void global_messageHandler_KickMetal() {
}
int global_messageHandler1(ExCommand *cmd) {
- debug(0, "global_messageHandler1: %d %d", cmd->_messageKind, cmd->_messageNum);
+ debug(5, "global_messageHandler1: %d %d", cmd->_messageKind, cmd->_messageNum);
if (cmd->_excFlags & 0x10000) {
if (cmd->_messageNum == MV_MAN_TOLADDER)
@@ -306,6 +306,7 @@ int global_messageHandler3(ExCommand *cmd) {
case 17:
switch (cmd->_messageNum) {
case 61:
+ debug(0, "preload: { %d, %d },", cmd->_parentId, cmd->_keyCode);
return g_fp->_gameLoader->preloadScene(cmd->_parentId, cmd->_keyCode);
case 62:
return g_fp->_gameLoader->gotoScene(cmd->_parentId, cmd->_keyCode);
@@ -647,7 +648,7 @@ int global_messageHandler4(ExCommand *cmd) {
g_fp->_currentScene->_messageQueueId = cmd->_parId;
}
} else {
- g_fp->_sceneRect.moveTo(offX, offY);
+ g_fp->_sceneRect.translate(offX - g_fp->_sceneRect.left, offY - g_fp->_sceneRect.top);
g_fp->_currentScene->_x = 0;
g_fp->_currentScene->_y = 0;