diff options
author | Eugene Sandulenko | 2013-09-01 01:41:26 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2013-09-06 14:51:22 +0300 |
commit | 9abf4f6f890ae8b93c940e8191f5461e500a1c6a (patch) | |
tree | d46dad2d2742319d171f27825820d57719ba002e /engines | |
parent | d6309755fc8b67e2ade20008e6f9d1fc911095c9 (diff) | |
download | scummvm-rg350-9abf4f6f890ae8b93c940e8191f5461e500a1c6a.tar.gz scummvm-rg350-9abf4f6f890ae8b93c940e8191f5461e500a1c6a.tar.bz2 scummvm-rg350-9abf4f6f890ae8b93c940e8191f5461e500a1c6a.zip |
FULLPIPE: Added more debug output
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/fullpipe.cpp | 3 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 5 | ||||
-rw-r--r-- | engines/fullpipe/statics.cpp | 20 |
3 files changed, 20 insertions, 8 deletions
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index 5c1d19ba7b..6bd8c82eb6 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -341,6 +341,8 @@ void FullpipeEngine::cleanup() { } void FullpipeEngine::updateScreen() { + debug(4, "FullpipeEngine::updateScreen()"); + _mouseVirtX = _mouseScreenPos.x + _sceneRect.left; _mouseVirtY = _mouseScreenPos.y + _sceneRect.top; @@ -361,7 +363,6 @@ void FullpipeEngine::updateScreen() { } } } else if (_currentScene) { - //_currentScene->update(42); // HACK. FIXME _currentScene->draw(); if (_inventoryScene) diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 9054c4c7a7..4f2f7c34d1 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -667,6 +667,8 @@ void global_messageHandler_KickMetal() { } int global_messageHandler1(ExCommand *cmd) { + debug(0, "global_messageHandler1: %d %d", cmd->_messageKind, cmd->_messageNum); + if (cmd->_excFlags & 0x10000) { if (cmd->_messageNum == MV_MAN_TOLADDER) cmd->_messageNum = MV_MAN_TOLADDER2; @@ -837,8 +839,6 @@ void staticANIObjectCallback(int *arg) { } int global_messageHandler2(ExCommand *cmd) { - debug(0, "global_messageHandler2()"); - if (cmd->_messageKind != 17) return 0; @@ -1082,7 +1082,6 @@ int global_messageHandler3(ExCommand *cmd) { int global_messageHandler4(ExCommand *cmd) { StaticANIObject *ani = 0; - debug(0, "global_messageHandler4: %d %d", cmd->_messageKind, cmd->_messageNum); switch (cmd->_messageKind) { case 18: { MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(cmd->_messageNum), cmd->_parId, 0); diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 0d56125a3d..5369042cce 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -467,7 +467,7 @@ void StaticANIObject::draw() { Common::Point point; Common::Rect rect; - debug(0, "StaticANIObject::draw() (%s) [%d]", transCyrillic((byte *)_objectName), _id); + debug(0, "StaticANIObject::draw() (%s) [%d] [%d, %d]", transCyrillic((byte *)_objectName), _id, _ox, _oy); if (_shadowsOn && g_fullpipe->_currentScene && g_fullpipe->_currentScene->_shadows && (getCurrDimensions(point)->x != 1 || getCurrDimensions(point)->y != 1)) { @@ -527,7 +527,7 @@ void StaticANIObject::draw() { } void StaticANIObject::draw2() { - debug(0, "StatciANIObject::draw2()"); + debug(0, "StatciANIObject::draw2(): id: (%s) %d [%d, %d]", transCyrillic((byte *)_objectName), _id, _ox, _oy); if ((_flags & 4) && (_flags & 0x10)) { if (_movement) { @@ -602,7 +602,7 @@ Common::Point *StaticANIObject::getCurrDimensions(Common::Point &p) { void StaticANIObject::update(int counterdiff) { int mqid; - debug(0, "StaticANIObject::update() (%x)", _flags); + debug(0, "StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); if (_flags & 2) { _messageNum--; @@ -712,6 +712,8 @@ void StaticANIObject::update(int counterdiff) { } } } + + debug(0, " StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); } void StaticANIObject::stopAnim_maybe() { @@ -915,7 +917,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase if (_flags & 0x80) return false; - debug(0, "StaticANIObject::startAnim(%d, %d, %d)", movementId, messageQueueId, dynPhaseIdx); + debug(0, "StaticANIObject::startAnim(%d, %d, %d) (%s [%d]) [%d, %d]", movementId, messageQueueId, dynPhaseIdx, transCyrillic((byte *)_objectName), _id, _ox, _oy); if (_messageQueueId) { updateGlobalMessageQueue(messageQueueId, _id); @@ -948,16 +950,20 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase int newy = _oy; Common::Point point; + debug(0, "0 %d %d", newx, newy); if (_movement) { _movement->getCurrDynamicPhaseXY(point); newx -= point.x; newy -= point.y; + + debug(0, "1 %d %d", newx, newy); } else if (_statics) { _statics->getSomeXY(point); newx -= point.x; newy -= point.y; + debug(0, "2 %d %d", newx, newy); } _movement = mov; @@ -975,6 +981,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase newx += point.x + _movement->_mx; newy += point.y + _movement->_my; + debug(0, "3 %d %d", newx, newy); _stepArray.gotoNextPoint(); ExCommand *ex = _movement->_currDynamicPhase->getExCommand(); @@ -988,9 +995,12 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase } } + debug(0, "4 %d %d", newx, newy); _movement->getCurrDynamicPhaseXY(point); setOXY(point.x + newx, point.y + newy); + debug(0, " StaticANIObject::startAnim(%d, %d, %d) (%s [%d]) [%d, %d]", movementId, messageQueueId, dynPhaseIdx, transCyrillic((byte *)_objectName), _id, _ox, _oy); + if (_movement->_staticsObj2->_staticsId & 0x4000) _flags |= 8; else @@ -1568,6 +1578,8 @@ DynamicPhase::DynamicPhase(DynamicPhase *src, bool reverse) { _field_7E = 0; _rect = new Common::Rect(); + debug(0, "DynamicPhase::DynamicPhase(src, %d)", reverse); + if (reverse) { if (!src->_bitmap) src->init(); |