diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 4 | ||||
| -rw-r--r-- | engines/fullpipe/statics.cpp | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 4f2f7c34d1..0c06e03b75 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -1370,10 +1370,10 @@ void scene01_initScene(Scene *sc, int entrance) { pic->_flags &= 0xFFFB; } - if (entrance != TrubaLeft ) { + if (entrance != TrubaLeft) { StaticANIObject *bootAnim = sc->getStaticANIObject1ById(ANI_BOOT_1, -1); if (bootAnim) - bootAnim->_flags &= 0xFFFB; + bootAnim->_flags &= ~0x04; } setElevatorButton(sO_Level2, ST_LBN_2N); diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index cb23b60c24..8fe119e2ba 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -217,6 +217,7 @@ void StaticANIObject::setFlags40(bool state) { if (_flags & 0x40) _flags ^= 0x40; } + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); } void StaticANIObject::deleteFromGlobalMessageQueue() { @@ -239,6 +240,7 @@ void StaticANIObject::queueMessageQueue(MessageQueue *mq) { _messageNum = 0; if (_flags & 2) { _flags ^= 2; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); } if (mq) { _animExFlag = 0; @@ -266,6 +268,7 @@ bool StaticANIObject::trySetMessageQueue(int msgNum, int qId) { } _flags |= 2; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); _messageNum = msgNum; _messageQueueId = qId; @@ -611,6 +614,7 @@ void StaticANIObject::update(int counterdiff) { int mqid; debug(0, "StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); + if (_id == 322 && _oy != 100) warning("StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); if (_flags & 2) { _messageNum--; @@ -620,6 +624,7 @@ void StaticANIObject::update(int counterdiff) { mqid = _messageQueueId; _messageQueueId = 0; _flags ^= 2; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); updateGlobalMessageQueue(mqid, _id); return; @@ -699,6 +704,7 @@ void StaticANIObject::update(int counterdiff) { } else if (_flags & 0x20) { _flags ^= 0x20; _flags |= 1; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); _movement->gotoFirstFrame(); _movement->getCurrDynamicPhaseXY(point); @@ -722,6 +728,8 @@ void StaticANIObject::update(int counterdiff) { } debug(0, " StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); + if (_id == 322 && _oy != 100) + warning(" StaticANIObject::update() (%s) [%d] [%d, %d] fl: %x", transCyrillic((byte *)_objectName), _id, _ox, _oy, _flags); } void StaticANIObject::stopAnim_maybe() { @@ -731,6 +739,7 @@ void StaticANIObject::stopAnim_maybe() { return; _flags ^= 1; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); int oid = 0; int oldmqid = _messageQueueId; @@ -897,6 +906,7 @@ void StaticANIObject::show1(int x, int y, int movId, int mqId) { if (_flags & 1) _flags ^= 1; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); _messageQueueId = mqId; } @@ -951,6 +961,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase if (mov == _movement) { _flags |= 1; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); _messageQueueId = messageQueueId; return true; @@ -1014,6 +1025,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase _flags &= 0xFFF7; _flags |= 1; + if (_id == 322) warning("%d [%d, %d] fl: %x", __LINE__, _ox, _oy, _flags); _messageQueueId = messageQueueId; _movement->_currDynamicPhase->_countdown = _movement->_currDynamicPhase->_initialCountdown; |