[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.306,1.307 actor.h,1.71,1.72 saveload.h,1.43,1.44

[Travis Howell]

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

Modified Files:
	actor.cpp actor.h saveload.h 
Log Message:

Increase Actor animVariable for HE80+ games.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- actor.cpp	1 Oct 2004 23:04:47 -0000	1.306
+++ actor.cpp	2 Oct 2004 10:58:15 -0000	1.307
@@ -1994,7 +1994,10 @@
 		MKARRAY_OLD(Actor, sound[0], sleByte, 8, VER(8), VER(36)),
 		MKARRAY(Actor, sound[0], sleByte, 32, VER(37)),
 
-		MKARRAY(Actor, animVariable[0], sleUint16, 8, VER(8)),
+		// Actor animVariable grew from 8 to 27
+		MKARRAY_OLD(Actor, animVariable[0], sleUint16, 8, VER(8), VER(40)),
+		MKARRAY(Actor, animVariable[0], sleUint16, 27, VER(41)),
+
 		MKLINE(Actor, targetFacing, sleUint16, VER(8)),
 		MKLINE(Actor, moving, sleByte, VER(8)),
 		MKLINE(Actor, ignoreBoxes, sleByte, VER(8)),

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- actor.h	30 Sep 2004 23:49:46 -0000	1.71
+++ actor.h	2 Oct 2004 10:58:15 -0000	1.72
@@ -152,7 +152,7 @@
 	byte animProgress, animSpeed;
 	bool costumeNeedsInit;
 	ActorWalkData walkdata;
-	int16 animVariable[16];
+	int16 animVariable[27];
 
 	static ScummEngine *_vm;
 
@@ -222,9 +222,11 @@
 	}
 
 	int getAnimVar(byte var) const {
+		checkRange(26, 0, var, "getAnimVar %d out of range(r)");
 		return animVariable[var];
 	}
 	void setAnimVar(byte var, int value) {
+		checkRange(26, 0, var, "setAnimVar %d out of range(r)");
 		animVariable[var] = value;
 	}
 	

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- saveload.h	14 Sep 2004 15:06:01 -0000	1.43
+++ saveload.h	2 Oct 2004 10:58:15 -0000	1.44
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 40
+#define CURRENT_VER 41
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC