[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.117,2.118

Max Horn fingolfin at users.sourceforge.net
Thu May 22 18:22:07 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:
fixed butterknife + cashcard

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.117
retrieving revision 2.118
diff -u -d -r2.117 -r2.118
--- script_v2.cpp	23 May 2003 00:59:46 -0000	2.117
+++ script_v2.cpp	23 May 2003 01:14:29 -0000	2.118
@@ -968,13 +968,13 @@
 void Scumm_v2::o2_ifClassOfIs() {
 	int obj = getVarOrDirectWord(0x80);
 	int clsop = getVarOrDirectByte(0x40);
+	byte *obcd = getOBCDFromObject(obj);
 
-	if (getObjectIndex(obj) == -1) {
+	if (obcd == 0) {
 		o5_jumpRelative();
 		return;
 	}
 
-	byte *obcd = getOBCDFromObject(obj);
 	byte cls = *(obcd + 6);
 	if ((cls & clsop) != clsop) {
 		o5_jumpRelative();





More information about the Scummvm-git-logs mailing list