[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.66,1.67 script_v1.cpp,1.105,1.106
James Brown
ender at users.sourceforge.net
Sat May 11 10:50:02 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv1281
Modified Files:
object.cpp script_v1.cpp
Log Message:
Zak walkbox locking fixes.
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- object.cpp 5 May 2002 18:10:28 -0000 1.66
+++ object.cpp 11 May 2002 17:49:41 -0000 1.67
@@ -31,6 +31,9 @@
checkRange(32, 1, cls, "Class %d out of range in getClass");
if (_features & GF_SMALL_HEADER) {
+ if (cls == 31) // CLASS_PLAYERONLY
+ cls = 23;
+
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
}
@@ -46,6 +49,9 @@
if (_features & GF_SMALL_HEADER) {
+ if (cls == 31) // CLASS_PLAYERONLY
+ cls = 23;
+
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
}
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- script_v1.cpp 11 May 2002 14:55:03 -0000 1.105
+++ script_v1.cpp 11 May 2002 17:49:42 -0000 1.106
@@ -1644,10 +1644,13 @@
if (_features & GF_OLD256) {
a = getVarOrDirectByte(0x80);
b = fetchScriptByte();
- if (b == 0x40) // Lock Box
- setBoxFlags(a, 0x80);
- else
- setBoxFlags(a, 0);
+
+ if (b & 0x40) { // We don't use the locked
+ b &= ~0x40; // flag, so convert it to
+ b |= 0x80; // invisible
+ }
+
+ setBoxFlags(a, b);
return;
}
More information about the Scummvm-git-logs
mailing list