[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.130,1.131

Max Horn fingolfin at users.sourceforge.net
Sat May 24 16:09:01 CEST 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
work around for comi script calling o6_getActorRoom(255)

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- script_v6.cpp	24 May 2003 17:04:54 -0000	1.130
+++ script_v6.cpp	24 May 2003 23:08:03 -0000	1.131
@@ -1203,6 +1203,12 @@
 		return;
 	}
 
+	if (act == 255) {
+		// This case also occurs in COMI...
+		push(0);
+		return;
+	}
+
 	Actor *a = derefActor(act, "o6_getActorRoom");
 	push(a->room);
 }





More information about the Scummvm-git-logs mailing list