[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.112,2.113 script_v72he.cpp,2.236,2.237 scumm.cpp,1.407,1.408 scumm.h,1.566,1.567

[kirben]

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

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

The reverse actor layering only applies to pajama3


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.112
retrieving revision 2.113
diff -u -d -r2.112 -r2.113
--- script_v100he.cpp	6 Apr 2005 23:56:50 -0000	2.112
+++ script_v100he.cpp	7 Apr 2005 10:54:35 -0000	2.113
@@ -475,8 +475,7 @@
 		a->_needRedraw = true;
 		break;
 	case 59:
-		// Uses reverse order of layering, so we adjust
-		a->_layer = -pop();
+		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.236
retrieving revision 2.237
diff -u -d -r2.236 -r2.237
--- script_v72he.cpp	6 Apr 2005 17:31:11 -0000	2.236
+++ script_v72he.cpp	7 Apr 2005 10:54:35 -0000	2.237
@@ -1074,8 +1074,11 @@
 		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;
 	case 43: // HE 90+
-		// Uses reverse order of layering, so we adjust
-		a->_layer = -pop();
+		a->_layer = pop();
+		if (_gameId == GID_PAJAMA3) {
+			// pajama3 uses reverse order of layering, so we adjust
+			a->_layer = -a->_layer;
+		}
 		a->_needRedraw = true;
 		break;
 	case 64:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -d -r1.407 -r1.408
--- scumm.cpp	7 Apr 2005 10:43:51 -0000	1.407
+++ scumm.cpp	7 Apr 2005 10:54:35 -0000	1.408
@@ -352,9 +352,9 @@
 	// Humongous Entertainment Scumm Version ?
 	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 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_HEGAME, 6, 99, 61, MDT_NONE,
+	{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PAJAMA3, 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_HEGAME, 6, 99, 61, MDT_NONE,
+	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PAJAMA3, 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},

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -d -r1.566 -r1.567
--- scumm.h	7 Apr 2005 10:43:51 -0000	1.566
+++ scumm.h	7 Apr 2005 10:54:36 -0000	1.567
@@ -254,7 +254,8 @@
 	GID_PUTTMOON,
 	GID_FBEAR,
 	GID_FUNPACK,
-	GID_FREDDI4
+	GID_FREDDI4,
+	GID_PAJAMA3
 };
 
 struct SentenceTab {