[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.22,1.23
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Oct 7 01:23:08 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.54,1.55 language.cpp,1.8,1.9 palette.cpp,1.20,1.21 rdwin.cpp,1.31,1.32 render.cpp,1.34,1.35
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13267
Modified Files:
logic.cpp
Log Message:
Fixed assert(). I think -- I don't even get this far before ScummVM crashes
on me. :-)
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- logic.cpp 7 Oct 2003 00:26:04 -0000 1.22
+++ logic.cpp 7 Oct 2003 08:22:53 -0000 1.23
@@ -154,13 +154,12 @@
for (j = 1; j <= _areaMax[i]; j++)
for (k = 0; k < 8; k++) {
- assert(j < 12);
+ assert(j < 11);
_area[i][j][k] = READ_BE_UINT16(ptr);
ptr += 2;
}
-
- }
-
+ }
+
_objectBox = new Box[_numObjects + 1];
for (i = 1; i <= _numObjects; i++) {
_objectBox[i].x1 = READ_BE_UINT16(ptr);
@@ -172,7 +171,7 @@
_objectBox[i].y2 = READ_BE_UINT16(ptr);
ptr += 2;
}
-
+
//Walk OFF Data
_numWalkOffs = READ_BE_UINT16(ptr);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.54,1.55 language.cpp,1.8,1.9 palette.cpp,1.20,1.21 rdwin.cpp,1.31,1.32 render.cpp,1.34,1.35
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list