libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert my removal of _skipPalette, still required.

Browse Source 
svn-id: r18277
This commit is contained in:
Travis Howell 2005-05-28 02:26:14 +00:00
parent 51a46f9c91
commit b65974b7b4
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scumm/smush/smush_player.cpp
View File

@ -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);

1
scumm/smush/smush_player.h
View File

@ -79,6 +79,7 @@ private:
int _warpButtons;
bool _insanity;
bool _middleAudio;
bool _skipPalette;
#ifdef _WIN32_WCE
bool _inTimer;
int16 _inTimerCount;