[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.161,1.162 smush_player.h,1.49,1.50
kirben
kirben at users.sourceforge.net
Fri May 27 19:26:30 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.537,1.538
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.503,2.504 script_v100he.cpp,2.158,2.159 script_v5.cpp,1.285,1.286 script_v6.cpp,1.440,1.441 script_v6he.cpp,2.158,2.159 script_v72he.cpp,2.298,2.299 script_v7he.cpp,2.157,2.158 script_v8.cpp,2.293,2.294 script_v80he.cpp,2.118,2.119 script_v90he.cpp,2.263,2.264
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4782/scumm/smush
Modified Files:
smush_player.cpp smush_player.h
Log Message:
Revert my removal of _skipPalette, still required.
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- smush_player.cpp 10 May 2005 23:48:42 -0000 1.161
+++ smush_player.cpp 28 May 2005 02:26:14 -0000 1.162
@@ -252,6 +252,7 @@
_speed = speed;
_insanity = false;
_middleAudio = false;
+ _skipPalette = false;
_IACTstream = NULL;
#ifdef _WIN32_WCE
_inTimer = false;
@@ -716,6 +717,9 @@
checkBlock(b, TYPE_NPAL, 0x300);
debugC(DEBUG_SMUSH, "SmushPlayer::handleNewPalette()");
+ if (_skipPalette)
+ return;
+
readPalette(_pal, b);
setDirtyColors(0, 255);
}
@@ -969,6 +973,10 @@
_version = b.getWord();
_nbframes = b.getWord();
b.getWord();
+
+ if (_skipPalette)
+ return;
+
readPalette(_pal, b);
setDirtyColors(0, 255);
}
@@ -1166,6 +1174,9 @@
_middleAudio = true;
pos -= 8;
}
+ _skipPalette = false;
+ } else {
+ _skipPalette = true;
}
_base->seek(pos, FileChunk::seek_start);
Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- smush_player.h 14 May 2005 23:28:22 -0000 1.49
+++ smush_player.h 28 May 2005 02:26:14 -0000 1.50
@@ -79,6 +79,7 @@
int _warpButtons;
bool _insanity;
bool _middleAudio;
+ bool _skipPalette;
#ifdef _WIN32_WCE
bool _inTimer;
int16 _inTimerCount;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.537,1.538
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.503,2.504 script_v100he.cpp,2.158,2.159 script_v5.cpp,1.285,1.286 script_v6.cpp,1.440,1.441 script_v6he.cpp,2.158,2.159 script_v72he.cpp,2.298,2.299 script_v7he.cpp,2.157,2.158 script_v8.cpp,2.293,2.294 script_v80he.cpp,2.118,2.119 script_v90he.cpp,2.263,2.264
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list