[Scummvm-cvs-logs] CVS: scummvm actor.h,1.15,1.16 actor.cpp,1.104,1.105 script.cpp,1.67,1.68 scumm.h,1.194,1.195 script_v1.cpp,1.132,1.133 script_v2.cpp,1.79,1.80

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9106

Modified Files:
	actor.h actor.cpp script.cpp scumm.h script_v1.cpp 
	script_v2.cpp 
Log Message:
workaround for bug #558236; renamed actorAnimate to animateCostume (to distinguish it a bit from animateActor); removed Scumm::animateActor

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- actor.h	26 Jul 2002 16:50:41 -0000	1.15
+++ actor.h	4 Aug 2002 02:53:50 -0000	1.16
@@ -146,7 +146,7 @@
 	void turnToDirection(int newdir);
 	void walkActor();
 	void drawActorCostume();
-	void actorAnimate();
+	void animateCostume();
 	void setActorCostume(int c);
 	byte *getActorName();
 	void startWalkActor(int x, int y, int dir);

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- actor.cpp	1 Aug 2002 13:46:16 -0000	1.104
+++ actor.cpp	4 Aug 2002 02:53:50 -0000	1.105
@@ -682,6 +682,10 @@
 	if (newdir != facing) {
 		moving = MF_TURN;
 		newDirection = newdir;
+
+		// FIXME - workaround for bug #558236
+		if (_vm->_gameId == GID_INDY4 && room == 39 && x == 617 && y == 125 && newdir == 180)
+			startAnimActor(standFrame);
 	}
 }
 
@@ -831,7 +835,7 @@
 		if (a->costume) {
 			CHECK_HEAP getMaskFromBox(a->walkbox);
 			a->drawActorCostume();
-			CHECK_HEAP a->actorAnimate();
+			CHECK_HEAP a->animateCostume();
 		}
 	}
 }
@@ -921,7 +925,7 @@
 	}
 }
 
-void Actor::actorAnimate()
+void Actor::animateCostume()
 {
 	if (costume == 0)
 		return;

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- script.cpp	30 Jul 2002 15:20:30 -0000	1.67
+++ script.cpp	4 Aug 2002 02:53:50 -0000	1.68
@@ -899,15 +899,6 @@
 	derefActorSafe(act, "faceActorToObj")->turnToDirection(dir);
 }
 
-void Scumm::animateActor(int act, int anim)
-{
-	Actor *a = derefActorSafe(act, "animateActor");
-	if (!a)
-		return;
-
-	a->animateActor(anim);
-}
-
 bool Scumm::isScriptRunning(int script)
 {
 	int i;
@@ -928,7 +919,6 @@
 	return false;
 
 }
-
 
 
 void Scumm::beginOverride()

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- scumm.h	3 Aug 2002 11:57:10 -0000	1.194
+++ scumm.h	4 Aug 2002 02:53:50 -0000	1.195
@@ -799,7 +799,6 @@
 	void processActors();
 	int getActorFromPos(int x, int y);
 	void faceActorToObj(int act, int obj);
-	void animateActor(int act, int anim);
 	void actorFollowCamera(int act);
 	
 	bool isCostumeInUse(int i);

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- script_v1.cpp	1 Aug 2002 13:00:53 -0000	1.132
+++ script_v1.cpp	4 Aug 2002 02:53:50 -0000	1.133
@@ -876,11 +876,14 @@
 
 void Scumm::o5_animateActor()
 {
-	int act, anim;
+	int act = getVarOrDirectByte(0x80);
+	int anim = getVarOrDirectByte(0x40);
 
-	act = getVarOrDirectByte(0x80);
-	anim = getVarOrDirectByte(0x40);
-	animateActor(act, anim);
+	Actor *a = derefActorSafe(act, "o5_animateActor");
+	if (!a)
+		return;
+
+	a->animateActor(anim);
 }
 
 void Scumm::o5_badOpcode()

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- script_v2.cpp	28 Jul 2002 01:40:24 -0000	1.79
+++ script_v2.cpp	4 Aug 2002 02:53:50 -0000	1.80
@@ -1429,7 +1429,11 @@
 	int anim = pop();
 	int act = pop();
 
-	animateActor(act, anim);
+	Actor *a = derefActorSafe(act, "o6_animateActor");
+	if (!a)
+		return;
+
+	a->animateActor(anim);
 }
 
 void Scumm::o6_doSentence()