[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.58,2.59 scumm.cpp,1.38,1.39

Travis Howell kirben at users.sourceforge.net
Sat Jun 5 22:22:04 CEST 2004


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

Modified Files:
	script_v6he.cpp scumm.cpp 
Log Message:

puttdemo doesn't need HE specific opcodes.
actorOps case 225 isn't need for HE, was left over from scumm6.
No need to check for invalid cases, since earlier HE game didn't use those cases.


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.58
retrieving revision 2.59
diff -u -d -r2.58 -r2.59
--- script_v6he.cpp	6 Jun 2004 04:55:33 -0000	2.58
+++ script_v6he.cpp	6 Jun 2004 05:20:52 -0000	2.59
@@ -45,9 +45,6 @@
 // FBEAR (fbear, fbeardemo)
 //     transparency in akos.cpp
 //     negative size in file read/write
-// PUTTDEMO (puttdemo)
-//     startSound issue -- check
-//     actorOps sub 86 -- check
 
 #define OPCODE(x)	{ &ScummEngine_v6he::x, #x }
 
@@ -404,12 +401,9 @@
 }
 
 void ScummEngine_v6he::o6_startSound() {
-	if (_gameId != GID_PUTTDEMO) {
-		// Seems to range between 952 - 9000
-		int offset = pop();
-		debug(2, "o6_startSound: offset %d", offset);
-	}
-
+	// Seems to range between 952 - 9000
+	int offset = pop();
+	debug(2, "o6_startSound: offset %d", offset);
 	_sound->addSoundToQueue(pop());
 }
 
@@ -561,10 +555,6 @@
 
 	switch (b) {
 	case 30:
-		if (_heversion <= 70) {
-			error("o6_actorOps: default case %d", b);
-		}
-
 		k = pop();
 		j = pop();
 		i = pop();
@@ -616,10 +606,7 @@
 		j = pop();
 		i = pop();
 		checkRange(255, 0, i, "Illegal palette slot %d");
-		if (_gameId != GID_PUTTDEMO)
-			a->remapActorPaletteColor(i, j);
-		else
-			a->setPalette(i, j);
+		a->setPalette(i, j);
 		break;
 	case 87:		// SO_TALK_COLOR
 		a->talkColor = pop();
@@ -708,12 +695,8 @@
 		a->needBgReset = true;
 		break;
 	case 225:		// SO_ALWAYS_ZCLIP
-		if (_heversion < 70) {
-			a->forceClip = pop(); // FIXME: where does this come from?
-		} else {
-			i = pop(); // talkie slot
-			warning("o6_actorOps: stub case %d", b);
-		}
+		i = pop(); // talkie slot
+		warning("o6_actorOps: stub case %d", b);
 		break;
 	default:
 		error("o6_actorOps: default case %d", b);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- scumm.cpp	6 Jun 2004 02:20:53 -0000	1.38
+++ scumm.cpp	6 Jun 2004 05:20:52 -0000	1.39
@@ -194,7 +194,7 @@
 	// Humongous Entertainment Scumm Version 6
 	{"puttputt", "Putt-Putt Joins The Parade", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_NATIVE,
+	{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, 0, MDT_ADLIB | MDT_NATIVE,
 	  GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
 	{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
@@ -3026,7 +3026,7 @@
 		engine = new ScummEngine_v5(detector, syst, game);
 		break;
 	case 6:
-		if (game.features & GF_HUMONGOUS) {
+		if (game.heversion >= 60) {
 			// TODO: probably use another variable with version number
 #ifndef __PALM_OS__
 			if (game.heversion >= 70)





More information about the Scummvm-git-logs mailing list