[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.106,1.107
Eugene Sandulenko
sev at users.sourceforge.net
Fri Jan 30 18:54:50 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18604/scumm/smush
Modified Files:
smush_player.cpp
Log Message:
o Fix crash in FT intro
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- smush_player.cpp 30 Jan 2004 02:14:29 -0000 1.106
+++ smush_player.cpp 30 Jan 2004 02:37:18 -0000 1.107
@@ -679,6 +679,10 @@
if ((height > _vm->_screenHeight) || (width > _vm->_screenWidth))
return;
+ // Special case for FT smush files.
+ if ((height == 1) && (width == 1))
+ return;
+
if (!_alreadyInit) {
_codec37.init(width, height);
_codec47.init(width, height);
@@ -690,7 +694,6 @@
b.getWord();
b.getWord();
-
int32 chunk_size = b.getSize() - 14;
byte *chunk_buffer = (byte *)malloc(chunk_size);
assert(chunk_buffer);
@@ -699,7 +702,7 @@
switch (codec) {
case 1:
case 3:
- smush_decode_codec1(_dst, chunk_buffer, left, top, height, width, _vm->_screenWidth);
+ //smush_decode_codec1(_dst, chunk_buffer, left, top, height, width, _vm->_screenWidth);
break;
case 37:
_codec37.decode(_dst, chunk_buffer);
More information about the Scummvm-git-logs
mailing list