[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.295,1.296 actor.h,1.65,1.66 intern.h,2.266,2.267 script_v90he.cpp,2.49,2.50

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6573/scumm

Modified Files:
	actor.cpp actor.h intern.h script_v90he.cpp 
Log Message:

Add HE90+ opcode difference


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- actor.cpp	20 Sep 2004 18:27:12 -0000	1.295
+++ actor.cpp	21 Sep 2004 05:59:26 -0000	1.296
@@ -81,12 +81,13 @@
 		talkUnk = 0;
 		if (_vm->_version >= 7)
 			visible = false;
+		skipLimb = false;
 	} else if (mode == 2) {
 		facing = 180;
 		condMask = 1;
+		skipLimb = false;
 	}
 	elevation = 0;
-	skipLimb = false;
 	width = 24;
 	talkColor = 15;
 	talkPosX = 0;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- actor.h	18 Sep 2004 00:36:14 -0000	1.65
+++ actor.h	21 Sep 2004 05:59:26 -0000	1.66
@@ -216,6 +216,10 @@
 		animProgress = 0;
 	}
 
+	int getAnimProgress() const {
+		return animProgress;
+	}
+
 	int getElevation() const {
 		return elevation;
 	}

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.266
retrieving revision 2.267
diff -u -d -r2.266 -r2.267
--- intern.h	21 Sep 2004 01:00:29 -0000	2.266
+++ intern.h	21 Sep 2004 05:59:26 -0000	2.267
@@ -851,6 +851,7 @@
 	void o90_unknown3A();
 	void o90_unknown94();
 	void o90_unknown9E();
+	void o90_getActorAnimProgress();
 };
 
 class ScummEngine_v7 : public ScummEngine_v6 {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- script_v90he.cpp	21 Sep 2004 01:00:30 -0000	2.49
+++ script_v90he.cpp	21 Sep 2004 05:59:26 -0000	2.50
@@ -258,7 +258,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o60_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o90_getActorAnimProgress),
 		/* AC */
 		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),
@@ -1038,4 +1038,9 @@
 	debug(1,"o90_unknown9E stub (%d)", subOp);
 }
 
+void ScummEngine_v90he::o90_getActorAnimProgress() {
+	Actor *a = derefActor(pop(), "o90_getActorAnimProgress");
+	push(a->getAnimProgress());
+}
+
 } // End of namespace Scumm