[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.41,1.42

[Max Horn]

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

Modified Files:
	script_v6.cpp 
Log Message:
two changes to accomodate Dig - don't like this :-/

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- script_v6.cpp	16 Jan 2003 00:40:19 -0000	1.41
+++ script_v6.cpp	16 Jan 2003 01:46:59 -0000	1.42
@@ -1300,8 +1300,10 @@
 void Scumm_v6::o6_getActorScaleX()
 {
 	Actor *a = derefActorSafe(pop(), "o6_getActorScale");
-	assert(a);
-	push(a->scalex);
+	if(!a)
+		push(0); // FIXME: DIG seems to call this with an invalid actor id
+	else
+		push(a->scalex);
 }
 
 void Scumm_v6::o6_getActorAnimCounter1()
@@ -1315,8 +1317,10 @@
 {
 	int var = pop();
 	Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable");
-	assert(a);
-	push(a->getAnimVar(var));
+	if(!a)
+		push(0); // FIXME: DIG seems to call this with an invalid actor id
+	else
+		push(a->getAnimVar(var));
 }
 
 void Scumm_v6::o6_isActorInBox()