[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.87,1.88 gfx.cpp,2.449,2.450
Eugene Sandulenko
sev at users.sourceforge.net
Mon May 16 16:28:12 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31842
Modified Files:
boxes.cpp gfx.cpp
Log Message:
Fix from Quiteust for boxes in MM NES.
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- boxes.cpp 30 Apr 2005 22:24:02 -0000 1.87
+++ boxes.cpp 16 May 2005 19:52:46 -0000 1.88
@@ -117,6 +117,8 @@
} else {
Box *ptr = getBoxBaseAddr(box);
assert(ptr);
+ if (!ptr)
+ return;
if (_version == 8)
ptr->v8.flags = TO_LE_32(val);
else if (_version <= 2)
@@ -368,6 +370,11 @@
if (!ptr || box == 255)
return NULL;
+ // The NES version of Maniac Mansion attempts to set flags for boxes 2-4
+ // when there are only three boxes (0-2) when walking out to the garage.
+ if ((_gameId == GID_MANIAC) && (_platform == Common::kPlatformNES) && (box >= ptr[0]))
+ return NULL;
+
// FIXME: In "pass to adventure", the loom demo, when bobbin enters
// the tent to the elders, box = 2, but ptr[0] = 2 -> errors out.
// Hence we disable the check for now. Maybe in PASS (and other old games)
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.449
retrieving revision 2.450
diff -u -d -r2.449 -r2.450
--- gfx.cpp 14 May 2005 22:55:39 -0000 2.449
+++ gfx.cpp 16 May 2005 19:52:46 -0000 2.450
@@ -2124,7 +2124,6 @@
return;
}
for (int y = 0; y < height; y++) {
- // the ? 0xFF : 0x00 here might be backwards - '1' bits indicate that sprites can get hidden
byte c = (((_objectMode ? _NES.masktableObj : _NES.masktable)[y][x >> 3] >> (x & 7)) & 1) ? 0xFF : 0x00;
for (int i = 0; i < 8; i++) {
*dst = c;
More information about the Scummvm-git-logs
mailing list