[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.379.2.2,1.379.2.3 actor.h,1.83.2.2,1.83.2.3 saveload.h,1.64.2.2,1.64.2.3 script_v100he.cpp,2.173.2.2,2.173.2.3 script_v72he.cpp,2.307.2.2,2.307.2.3 scumm.cpp,1.603.2.6,1.603.2.7 scumm.h,1.647.2.2,1.647.2.3

kirben kirben at users.sourceforge.net
Fri Oct 21 05:12:32 CEST 2005


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

Modified Files:
      Tag: branch-0-8-0
	actor.cpp actor.h saveload.h script_v100he.cpp 
	script_v72he.cpp scumm.cpp scumm.h 
Log Message:

Actor layer in HE games uses an int32.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.379.2.2
retrieving revision 1.379.2.3
diff -u -d -r1.379.2.2 -r1.379.2.3
--- actor.cpp	21 Oct 2005 02:30:49 -0000	1.379.2.2
+++ actor.cpp	21 Oct 2005 12:11:10 -0000	1.379.2.3
@@ -2201,7 +2201,9 @@
 		MKLINE(Actor, _talkPosX, sleInt16, VER(8)),
 		MKLINE(Actor, _ignoreTurns, sleByte, VER(8)),
 
-		MKLINE(Actor, _layer, sleByte, VER(8)),
+		// Actor layer switched to int32 in HE games
+		MKLINE_OLD(Actor, _layer, sleByte, VER(8), VER(57)),
+		MKLINE(Actor, _layer, sleInt32, VER(58)),
 
 		MKLINE(Actor, _talkScript, sleUint16, VER(8)),
 		MKLINE(Actor, _walkScript, sleUint16, VER(8)),

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.83.2.2
retrieving revision 1.83.2.3
diff -u -d -r1.83.2.2 -r1.83.2.3
--- actor.h	21 Oct 2005 02:30:49 -0000	1.83.2.2
+++ actor.h	21 Oct 2005 12:11:10 -0000	1.83.2.3
@@ -129,7 +129,7 @@
 	uint16 _talkScript, _walkScript;
 	bool _ignoreTurns;
 	bool _drawToBackBuf;
-	int8 _layer;
+	int32 _layer;
 	uint16 _sound[32];
 	CostumeData _cost;
 

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.64.2.2
retrieving revision 1.64.2.3
diff -u -d -r1.64.2.2 -r1.64.2.3
--- saveload.h	19 Oct 2005 12:11:31 -0000	1.64.2.2
+++ saveload.h	21 Oct 2005 12:11:10 -0000	1.64.2.3
@@ -45,7 +45,7 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 57
+#define CURRENT_VER 58
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.173.2.2
retrieving revision 2.173.2.3
diff -u -d -r2.173.2.2 -r2.173.2.3
--- script_v100he.cpp	21 Oct 2005 02:30:49 -0000	2.173.2.2
+++ script_v100he.cpp	21 Oct 2005 12:11:10 -0000	2.173.2.3
@@ -457,7 +457,8 @@
 		a->_needRedraw = true;
 		break;
 	case 59:
-		a->_layer = pop();
+		// HE games use reverse order of layering, so we adjust
+		a->_layer = -pop();
 		a->_needRedraw = true;
 		break;
 	case 63:

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.307.2.2
retrieving revision 2.307.2.3
diff -u -d -r2.307.2.2 -r2.307.2.3
--- script_v72he.cpp	21 Oct 2005 02:30:49 -0000	2.307.2.2
+++ script_v72he.cpp	21 Oct 2005 12:11:10 -0000	2.307.2.3
@@ -1146,11 +1146,8 @@
 		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;
 	case 43: // HE 90+
-		a->_layer = pop();
-		if (_gameId != GID_FREDDICOVE) {
-			// HE games use reverse order of layering, so we adjust
-			a->_layer = -a->_layer;
-		}
+		// HE games use reverse order of layering, so we adjust
+		a->_layer = -pop();
 		a->_needRedraw = true;
 		break;
 	case 64:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.6
retrieving revision 1.603.2.7
diff -u -d -r1.603.2.6 -r1.603.2.7
--- scumm.cpp	21 Oct 2005 04:43:55 -0000	1.603.2.6
+++ scumm.cpp	21 Oct 2005 12:11:10 -0000	1.603.2.7
@@ -314,7 +314,7 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
 	// Humongous Entertainment Scumm Version ?
-	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_FREDDICOVE, 6, 99, MDT_NONE,
+	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_HE_NOSUBTITLES | GF_16BIT_COLOR | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformWindows},
@@ -429,9 +429,9 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 	{"21abe302e1b1e2b66d6f5c12e241ebfd", "Freddi Fish 5: The Case of the Creature of Coral Cave (Unencrypted Russian)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"45082a5c9f42ba14dacfe1fdeeba819d", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Demo)", GID_FREDDICOVE, 6, 100, MDT_NONE,
+	{"45082a5c9f42ba14dacfe1fdeeba819d", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Demo)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"6b257bb2827dd894b8109a50a1a18b5a", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Dutch Demo)", GID_FREDDICOVE, 6, 100, MDT_NONE,
+	{"6b257bb2827dd894b8109a50a1a18b5a", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Dutch Demo)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows}, // FF5Demo
 
 	{"4dbff3787aedcd96b0b325f2d92d7ad9", "Freddi Fish and Luther's Maze Madness (Updated)", GID_HEGAME, 6, 100, MDT_NONE,

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.647.2.2
retrieving revision 1.647.2.3
diff -u -d -r1.647.2.2 -r1.647.2.3
--- scumm.h	20 Oct 2005 14:44:52 -0000	1.647.2.2
+++ scumm.h	21 Oct 2005 12:11:10 -0000	1.647.2.3
@@ -237,7 +237,6 @@
 	GID_FBEAR,
 	GID_FUNPACK,
 	GID_FREDDI2,
-	GID_FREDDICOVE,
 	GID_PUTTDEMO,
 	GID_PUTTRACE,
 	GID_FUNSHOP,	// Used for all three funshops





More information about the Scummvm-git-logs mailing list