[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.242,2.243 scumm.cpp,1.412,1.413 scumm.h,1.567,1.568

[kirben]

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

Modified Files:
	script_v72he.cpp scumm.cpp scumm.h 
Log Message:

Actor layering only matches in freddicove


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.242
retrieving revision 2.243
diff -u -d -r2.242 -r2.243
--- script_v72he.cpp	8 Apr 2005 11:09:45 -0000	2.242
+++ script_v72he.cpp	8 Apr 2005 23:54:33 -0000	2.243
@@ -1075,8 +1075,8 @@
 		break;
 	case 43: // HE 90+
 		a->_layer = pop();
-		if (_gameId == GID_PAJAMA3) {
-			// pajama3 uses reverse order of layering, so we adjust
+		if (_gameId != GID_FREDDICOVE) {
+			// HE gmaes use reverse order of layering, so we adjust
 			a->_layer = -a->_layer;
 		}
 		a->_needRedraw = true;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -d -r1.412 -r1.413
--- scumm.cpp	8 Apr 2005 20:49:13 -0000	1.412
+++ scumm.cpp	8 Apr 2005 23:54:34 -0000	1.413
@@ -350,11 +350,11 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Humongous Entertainment Scumm Version ?
-	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 99, 61, MDT_NONE,
+	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_FREDDICOVE, 6, 99, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
-	{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PAJAMA3, 6, 99, 61, MDT_NONE,
+	{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_HEGAME, 6, 99, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
-	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PAJAMA3, 6, 99, 61, MDT_NONE,
+	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_HEGAME, 6, 99, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"SamsFunShop", "Pajama Sam's One-Stop Fun Shop", GID_HEGAME, 6, 99, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
@@ -375,7 +375,7 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Humongous Entertainment Scumm Version ?
-	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_HEGAME, 6, 100, 61, MDT_NONE,
+	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_FREDDICOVE, 6, 100, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Uses bink in external files for logos

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -d -r1.567 -r1.568
--- scumm.h	7 Apr 2005 10:54:36 -0000	1.567
+++ scumm.h	8 Apr 2005 23:54:34 -0000	1.568
@@ -255,7 +255,7 @@
 	GID_FBEAR,
 	GID_FUNPACK,
 	GID_FREDDI4,
-	GID_PAJAMA3
+	GID_FREDDICOVE
 };
 
 struct SentenceTab {