aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2004-01-30 02:37:18 +0000
committerEugene Sandulenko2004-01-30 02:37:18 +0000
commit3758815c095ec870f3dd45e1ba0821210a574b69 (patch)
tree9873d87bfc42bb52038ee99469bf174314dea9f5 /scumm
parent6dec294de5cc77cbdd7f341d3b6db6735a2669c0 (diff)
downloadscummvm-rg350-3758815c095ec870f3dd45e1ba0821210a574b69.tar.gz
scummvm-rg350-3758815c095ec870f3dd45e1ba0821210a574b69.tar.bz2
scummvm-rg350-3758815c095ec870f3dd45e1ba0821210a574b69.zip
o Fix crash in FT intro
svn-id: r12671
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/smush_player.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 0d57d5d666..c84fc8f92b 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -679,6 +679,10 @@ void SmushPlayer::handleFrameObject(Chunk &b) {
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 @@ void SmushPlayer::handleFrameObject(Chunk &b) {
b.getWord();
b.getWord();
-
int32 chunk_size = b.getSize() - 14;
byte *chunk_buffer = (byte *)malloc(chunk_size);
assert(chunk_buffer);
@@ -699,7 +702,7 @@ void SmushPlayer::handleFrameObject(Chunk &b) {
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);