[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.114,2.115

[Max Horn]

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

Modified Files:
	script_v2.cpp 
Log Message:
this fixme doesn't seem to be needed anymore

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.114
retrieving revision 2.115
diff -u -d -r2.114 -r2.115
--- script_v2.cpp	22 May 2003 23:45:34 -0000	2.114
+++ script_v2.cpp	23 May 2003 00:04:17 -0000	2.115
@@ -996,15 +996,11 @@
 	Actor *a;
 
 	a = derefActorSafe(act, "o2_putActor");
+	assert(a);
+
 	x = getVarOrDirectByte(0x40) * 8;
 	y = getVarOrDirectByte(0x20) * 2;
 
-	if (!a) {
-		// FIXME - this shouldn't be necessary but for now works around problems
-		// in the Zak intro.
-		warning("o2_putActor: actor %d not found", act);
-		return;
-	}
 	a->putActor(x, y, a->room);
 }
 
@@ -1036,6 +1032,8 @@
 	Actor *a;
 
 	a = derefActorSafe(getVarOrDirectByte(0x80), "o2_putActorAtObject");
+	assert(a);
+
 	obj = getVarOrDirectByte(0x40);
 	if (whereIsObject(obj) != WIO_NOT_FOUND)
 		getObjectXYPos(obj, x, y);
@@ -1043,6 +1041,7 @@
 		x = 240;
 		y = 120;
 	}
+
 	a->putActor(x, y, a->room);
 }