[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.268,2.269
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Mon Jul 7 23:29:06 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.33,1.34
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm base-costume.cpp,2.3,2.4 base-costume.h,1.11,1.12 costume.cpp,1.68,1.69 costume.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13626
Modified Files:
scummvm.cpp
Log Message:
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.
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.268
retrieving revision 2.269
diff -u -d -r2.268 -r2.269
--- scummvm.cpp 7 Jul 2003 22:10:49 -0000 2.268
+++ scummvm.cpp 8 Jul 2003 06:28:25 -0000 2.269
@@ -1468,7 +1468,7 @@
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);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.33,1.34
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm base-costume.cpp,2.3,2.4 base-costume.h,1.11,1.12 costume.cpp,1.68,1.69 costume.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list