[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.292,1.293 intern.h,2.261,2.262 script_v72he.cpp,2.108,2.109 script_v80he.cpp,2.32,2.33 script_v90he.cpp,2.43,2.44 scumm.cpp,1.214,1.215

[Travis Howell]

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

Modified Files:
	actor.cpp intern.h script_v72he.cpp script_v80he.cpp 
	script_v90he.cpp scumm.cpp 
Log Message:

Fix last commit
Add stub/warning


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- actor.cpp	19 Sep 2004 03:26:47 -0000	1.292
+++ actor.cpp	19 Sep 2004 08:37:19 -0000	1.293
@@ -1933,7 +1933,10 @@
 							warning("unimplemented compression type %d", comp);
 							break;
 						}
+					} else {
+						warning("unimplemented compression type %d", comp);
 					}
+
 				}
 				const uint8 *axur = findResourceData(MKID('AXUR'), auxd);
 				if (axur) {

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.261
retrieving revision 2.262
diff -u -d -r2.261 -r2.262
--- intern.h	18 Sep 2004 22:42:43 -0000	2.261
+++ intern.h	19 Sep 2004 08:37:19 -0000	2.262
@@ -739,6 +739,7 @@
 	void o72_wordArrayInc();
 	void o72_objectX();
 	void o72_objectY();
+	void o72_unknown56();
 	void o72_getTimer();
 	void o72_setTimer();
 	void o72_unknown5A();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- script_v72he.cpp	19 Sep 2004 00:15:17 -0000	2.108
+++ script_v72he.cpp	19 Sep 2004 08:37:19 -0000	2.109
@@ -152,7 +152,7 @@
 		/* 54 */
 		OPCODE(o72_objectX),
 		OPCODE(o72_objectY),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */
 		OPCODE(o72_getTimer),
@@ -743,6 +743,17 @@
 	push(_objs[objnum].y_pos);
 }
 
+void ScummEngine_v72he::o72_unknown56() {
+	// Drawing related
+	int a = pop();
+	int b = pop();
+	int c = pop();
+	int d = pop();
+	int e = pop();
+
+	debug(1, "stub o72_unknown56(%d, %d, %d, %d, %d)", a, b, c, d, e);
+}
+
 void ScummEngine_v72he::o72_getTimer() {
 	int timer = pop();
 	int cmd = fetchScriptByte();
@@ -1533,7 +1544,10 @@
 	copyScriptString(filename);
 	// The boot script in some HE games doen't set the 
 	// complete data file name. So we work around that.
-	if (!strcmp((char *)filename,".he3")) {
+	if (!strcmp((char *)filename,".he7")) {
+		memset(filename, 0, sizeof(filename));
+		sprintf((char *)filename, "%s.he7", _gameName.c_str());
+	} else if (!strcmp((char *)filename,".he3")) {
 		memset(filename, 0, sizeof(filename));
 		sprintf((char *)filename, "%s.he3", _gameName.c_str());
 	}
@@ -1920,9 +1934,7 @@
 
 	switch (type) {
 	case 6: // number
-		if (!strcmp((char *)option, "ReadPagesAutomatically"))
-			push(1);
-		else if (!strcmp((char *)option, "NoPrinting"))
+		if (!strcmp((char *)option, "NoPrinting"))
 			push(1);
 		else
 			push(0);

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- script_v80he.cpp	18 Sep 2004 22:09:34 -0000	2.32
+++ script_v80he.cpp	19 Sep 2004 08:37:19 -0000	2.33
@@ -152,7 +152,7 @@
 		/* 54 */
 		OPCODE(o72_objectX),
 		OPCODE(o72_objectY),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */
 		OPCODE(o72_getTimer),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.43
retrieving revision 2.44
diff -u -d -r2.43 -r2.44
--- script_v90he.cpp	18 Sep 2004 22:09:34 -0000	2.43
+++ script_v90he.cpp	19 Sep 2004 08:37:19 -0000	2.44
@@ -152,7 +152,7 @@
 		/* 54 */
 		OPCODE(o72_objectX),
 		OPCODE(o72_objectY),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */
 		OPCODE(o72_getTimer),

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- scumm.cpp	19 Sep 2004 06:02:59 -0000	1.214
+++ scumm.cpp	19 Sep 2004 08:37:20 -0000	1.215
@@ -1191,8 +1191,10 @@
 	scummInit();
 
 	if (VAR_DEBUGMODE != 0xFF) {
-			// This is NOT for the Mac version of Indy3/Loom
-			VAR(VAR_DEBUGMODE) = _debugMode;
+		// This is NOT for the Mac version of Indy3/Loom
+		VAR(VAR_DEBUGMODE) = _debugMode;
+		if (_heversion >= 80)
+			VAR(85) = 1;
 	}
 
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
@@ -1459,8 +1461,6 @@
 			VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
 		}
 		if (_heversion >= 80)
-			// Enable built-in debug mode keys
-			VAR(85) = 1;
 			VAR(VAR_WINDOWS_VERSION) = 40;
 		if (_heversion >= 90)
 			VAR(VAR_NUM_SPRITES) = _numSprites - 1;