aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-07-08 06:28:25 +0000
committerTorbjörn Andersson2003-07-08 06:28:25 +0000
commit7b017fcf7c9d81c3599226310b63b6bc2be85d70 (patch)
tree39d5de1ceb7b26b233ba668982d72c1c98c15338 /scumm
parentbf4e5742502098dda950ff10b75d8c18f45d7bb9 (diff)
downloadscummvm-rg350-7b017fcf7c9d81c3599226310b63b6bc2be85d70.tar.gz
scummvm-rg350-7b017fcf7c9d81c3599226310b63b6bc2be85d70.tar.bz2
scummvm-rg350-7b017fcf7c9d81c3599226310b63b6bc2be85d70.zip
Use the correct size (I hope) for decoding _C64MaskChar (whatever that is).
This should improve ScummVM's chances of surviving long enough to crash in the V1 costume renderer instead. svn-id: r8851
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 3fcf11a5ec..e2053070b6 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1468,7 +1468,7 @@ void Scumm::initRoomSubBlocks() {
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), gdi._C64PicMap, roomptr[4] * roomptr[5]);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), gdi._C64ColorMap, roomptr[4] * roomptr[5]);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), gdi._C64MaskMap, roomptr[4] * roomptr[5]);
- gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 18), gdi._C64MaskChar, READ_LE_UINT16(roomptr + 18));
+ gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 18), gdi._C64MaskChar, READ_LE_UINT16(roomptr + READ_LE_UINT16(roomptr + 18)));
gdi._C64ObjectMode = true;
} else if (_features & GF_OLD_BUNDLE) {
_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);