From 0e1c4fccca1d658114730f7cb805ebf89212bd05 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Mon, 17 Nov 2008 20:36:10 +0000 Subject: Hopefully fixed the regression described in bug #2299682 ("FT: Crash in the intro (regression in r34516)"), after discussing with Fingolfin. We didn't use to check the size of the STRK chunk before, and he didn't remember why we do now, so I've removed that test again. svn-id: r35107 --- engines/scumm/smush/saud_channel.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index a56afa8f44..b4c12b8553 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -62,12 +62,9 @@ bool SaudChannel::handleSubTags(int32 &offset) { break; case MKID_BE('SMRK'): _inData = false; - if (available_size >= (size + 8)) { - int32 subSize = READ_BE_UINT32((byte *)_tbuffer + offset + 4); - if (subSize != 0) - error("SMRK has an invalid size : %d", subSize); + if (available_size >= (size + 8)) _markReached = true; - } else + else return false; break; case MKID_BE('SHDR'): -- cgit v1.2.3