diff options
| author | Eugene Sandulenko | 2013-08-11 01:19:23 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-06 14:51:12 +0300 |
| commit | 60ca9f74ac8dfbfcee4bdae3ffbce039fce42854 (patch) | |
| tree | 9eb852ebd1cbff46d4615990ba832a36aa8ea588 /engines/fullpipe/statics.cpp | |
| parent | 1ca1a5dfa041179d980676c6aa8fa135f7b69a0e (diff) | |
| download | scummvm-rg350-60ca9f74ac8dfbfcee4bdae3ffbce039fce42854.tar.gz scummvm-rg350-60ca9f74ac8dfbfcee4bdae3ffbce039fce42854.tar.bz2 scummvm-rg350-60ca9f74ac8dfbfcee4bdae3ffbce039fce42854.zip | |
FULLPIPE: Fix bug with lost picture palettes
Diffstat (limited to 'engines/fullpipe/statics.cpp')
| -rw-r--r-- | engines/fullpipe/statics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 4854bb1d0d..3a82f7dbe6 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -574,7 +574,7 @@ bool StaticANIObject::setPicAniInfo(PicAniInfo *picAniInfo) { return false; } - debug(0, "StaticANIObject::setPicAniInfo() (%s [%d])", transCyrillic((byte *)_objectName), _id); + debug(0, "StaticANIObject::setPicAniInfo() (%s [%d]) type: %d, statid: %d, movid: %d", transCyrillic((byte *)_objectName), _id, picAniInfo->type, picAniInfo->staticsId, picAniInfo->movementId); if (picAniInfo->type & 3) { setOXY(picAniInfo->ox, picAniInfo->oy); @@ -585,7 +585,7 @@ bool StaticANIObject::setPicAniInfo(PicAniInfo *picAniInfo) { } if (picAniInfo->type & 1) { - _messageQueueId = picAniInfo->type >> 16; + _messageQueueId = (picAniInfo->type >> 16) & 0xffff; if (picAniInfo->staticsId) { _statics = getStaticsById(picAniInfo->staticsId); @@ -928,7 +928,7 @@ void Movement::removeFirstPhase() { } bool Movement::gotoNextFrame(int callback1, int callback2) { - debug(0, "Movement::gotoNextFrame(%d, %d)", callback1, callback2); + debug(8, "Movement::gotoNextFrame(%d, %d)", callback1, callback2); if (!callback2) { if (_currMovement) { @@ -1151,7 +1151,7 @@ DynamicPhase::DynamicPhase(DynamicPhase *src, bool reverse) { _field_6A = src->_field_6A; _dynFlags = src->_dynFlags; - setPaletteData(getPaletteData()); + setPaletteData(src->getPaletteData()); copyMemoryObject2(src); } |