diff options
| author | Travis Howell | 2005-05-28 02:26:14 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-28 02:26:14 +0000 |
| commit | b65974b7b40d2a93a8e33d0979fa235381a05c7d (patch) | |
| tree | fdb8a0dd3926e344869d1412e360ecb3841bac18 /scumm/smush | |
| parent | 51a46f9c91b1987e9788e24a55cbfb4bc36b70d3 (diff) | |
| download | scummvm-rg350-b65974b7b40d2a93a8e33d0979fa235381a05c7d.tar.gz scummvm-rg350-b65974b7b40d2a93a8e33d0979fa235381a05c7d.tar.bz2 scummvm-rg350-b65974b7b40d2a93a8e33d0979fa235381a05c7d.zip | |
Revert my removal of _skipPalette, still required.
svn-id: r18277
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 11 | ||||
| -rw-r--r-- | scumm/smush/smush_player.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 24c11d6bc5..2882001494 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -252,6 +252,7 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { _speed = speed; _insanity = false; _middleAudio = false; + _skipPalette = false; _IACTstream = NULL; #ifdef _WIN32_WCE _inTimer = false; @@ -716,6 +717,9 @@ void SmushPlayer::handleNewPalette(Chunk &b) { checkBlock(b, TYPE_NPAL, 0x300); debugC(DEBUG_SMUSH, "SmushPlayer::handleNewPalette()"); + if (_skipPalette) + return; + readPalette(_pal, b); setDirtyColors(0, 255); } @@ -969,6 +973,10 @@ void SmushPlayer::handleAnimHeader(Chunk &b) { _version = b.getWord(); _nbframes = b.getWord(); b.getWord(); + + if (_skipPalette) + return; + readPalette(_pal, b); setDirtyColors(0, 255); } @@ -1166,6 +1174,9 @@ void SmushPlayer::seekSan(const char *file, int32 pos, int32 contFrame) { _middleAudio = true; pos -= 8; } + _skipPalette = false; + } else { + _skipPalette = true; } _base->seek(pos, FileChunk::seek_start); diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h index 6785b05c11..3fd9862ca5 100644 --- a/scumm/smush/smush_player.h +++ b/scumm/smush/smush_player.h @@ -79,6 +79,7 @@ private: int _warpButtons; bool _insanity; bool _middleAudio; + bool _skipPalette; #ifdef _WIN32_WCE bool _inTimer; int16 _inTimerCount; |