[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.73,1.73.2.1
Max Horn
fingolfin at users.sourceforge.net
Sun Apr 11 16:34:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20368
Modified Files:
Tag: branch-0-6-0
boxes.cpp
Log Message:
Workaround for bug #847827 (FOA: Wrong sprite z-order at specific place)
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.73
retrieving revision 1.73.2.1
diff -u -d -r1.73 -r1.73.2.1
--- boxes.cpp 6 Jan 2004 12:45:29 -0000 1.73
+++ boxes.cpp 11 Apr 2004 23:19:39 -0000 1.73.2.1
@@ -60,8 +60,8 @@
int32 urx, ury;
int32 lrx, lry;
int32 llx, lly;
- uint32 mask; // FIXME - is 'mask' really here?
- uint32 flags; // FIXME - is 'flags' really here?
+ uint32 mask;
+ uint32 flags;
uint32 scaleSlot;
uint32 scale;
uint32 unk2;
@@ -92,6 +92,11 @@
if (!ptr)
return 0;
+ // WORKAROUND for bug #847827: This is a bug in the data files, as it also
+ // occurs with the original engine. We work around it here anyway.
+ if (_gameId == GID_INDY4 && _currentRoom == 225 && _roomResource == 94 && box == 8)
+ return 0;
+
if (_version == 8)
return (byte) FROM_LE_32(ptr->v8.mask);
else if (_version <= 2)
More information about the Scummvm-git-logs
mailing list