[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.107,2.108

Max Horn fingolfin at users.sourceforge.net
Thu May 22 06:58:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7463

Modified Files:
	script_v2.cpp 
Log Message:
fixed o2_ifClassOfIs

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.107
retrieving revision 2.108
diff -u -d -r2.107 -r2.108
--- script_v2.cpp	22 May 2003 13:18:54 -0000	2.107
+++ script_v2.cpp	22 May 2003 13:57:34 -0000	2.108
@@ -946,16 +946,16 @@
 }
 
 void Scumm_v2::o2_ifClassOfIs() {
-	int act = getVarOrDirectWord(0x80);
+	int obj = getVarOrDirectWord(0x80);
 	int clsop = getVarOrDirectByte(0x40);
 
-	if (getObjectIndex(act) == -1) {
+	if (getObjectIndex(obj) == -1) {
 		o5_jumpRelative();
 		return;
 	}
 
-	ObjectData *od = &_objs[getObjectIndex(act)];
-	byte cls = *(getResourceAddress(rtRoom, _currentRoom) + od->OBCDoffset + 10);
+	byte *obcd = getOBCDFromObject(obj);
+	byte cls = *(obcd + 6);
 	if ((cls & clsop) != clsop) {
 		o5_jumpRelative();
 		return;





More information about the Scummvm-git-logs mailing list