[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.43,1.44

[Max Horn]

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

Modified Files:
	script_v6.cpp 
Log Message:
reversed Dig workarounds - better to find the real cause of the regression, says Endy

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- script_v6.cpp	16 Jan 2003 01:49:33 -0000	1.43
+++ script_v6.cpp	16 Jan 2003 14:42:20 -0000	1.44
@@ -1300,10 +1300,8 @@
 void Scumm_v6::o6_getActorScaleX()
 {
 	Actor *a = derefActorSafe(pop(), "o6_getActorScale");
-	if(!a)
-		push(0); // FIXME: DIG seems to call this with an invalid actor id
-	else
-		push(a->scalex);
+	assert(a);
+	push(a->scalex);
 }
 
 void Scumm_v6::o6_getActorAnimCounter1()
@@ -1317,20 +1315,16 @@
 {
 	int var = pop();
 	Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable");
-	if(!a)
-		push(0); // FIXME: DIG seems to call this with an invalid actor id
-	else
-		push(a->getAnimVar(var));
+	assert(a);
+	push(a->getAnimVar(var));
 }
 
 void Scumm_v6::o6_isActorInBox()
 {
 	int box = pop();
 	Actor *a = derefActorSafe(pop(), "o6_isActorInBox");
-	if(!a)
-		push(0); // FIXME: DIG seems to call this with an invalid actor id
-	else
-		push(checkXYInBoxBounds(box, a->x, a->y));
+	assert(a);
+	push(checkXYInBoxBounds(box, a->x, a->y));
 }
 
 void Scumm_v6::o6_getActorLayer()
@@ -2301,8 +2295,8 @@
 
 void Scumm_v6::o6_printEgo()
 {
-	_actorToPrintStrFor = _vars[VAR_EGO];
-	decodeParseString(0, 0);
+	push(_vars[VAR_EGO]);
+	decodeParseString(0, 1);
 }
 
 void Scumm_v6::o6_talkActor()