[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.290,2.291 resource.cpp,1.280,1.281 script_v90he.cpp,2.78,2.79 scumm.cpp,1.243,1.244 scumm.h,1.506,1.507 vars.cpp,1.107,1.108

Travis Howell kirben at users.sourceforge.net
Sun Oct 3 21:25:29 CEST 2004 

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

Modified Files:
	intern.h resource.cpp script_v90he.cpp scumm.cpp scumm.h 
	vars.cpp 
Log Message:

Add some HE99 vars
Rename opcodes


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.290
retrieving revision 2.291
diff -u -d -r2.290 -r2.291
--- intern.h	4 Oct 2004 01:34:29 -0000	2.290
+++ intern.h	4 Oct 2004 02:23:01 -0000	2.291
@@ -882,13 +882,13 @@
 	void o90_unknown31();
 	void o90_unknown32();
 	void o90_findAllObjectsWithClassOf();
-	void o90_unknown35();
+	void o90_getPolygonOverlap();
 	void o90_unknown36();
 	void o90_dim2dim2Array();
-	void o90_unknown3A();
-	void o90_unknown44();
-	void o90_unknown94();
-	void o90_unknown9E();
+	void o90_sortArray();
+	void o90_getObjectData();
+	void o90_getPaletteData();
+	void o90_paletteOps();
 	void o90_unknownA5();
 	void o90_getActorAnimProgress();
 };

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- resource.cpp	1 Oct 2004 11:22:59 -0000	1.280
+++ resource.cpp	4 Oct 2004 02:23:01 -0000	1.281
@@ -2312,7 +2312,7 @@
 		_numLocalScripts = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // heap related
 		_numPalettes = _fileHandle.readUint16LE();
-		_fileHandle.readUint16LE(); // unknown
+		_numUnk = _fileHandle.readUint16LE();
 		_numTalkies = _fileHandle.readUint16LE();
 		_numNewNames = 10;
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -d -r2.78 -r2.79
--- script_v90he.cpp	4 Oct 2004 01:34:29 -0000	2.78
+++ script_v90he.cpp	4 Oct 2004 02:23:01 -0000	2.79
@@ -110,13 +110,13 @@
 		OPCODE(o6_invalid),
 		/* 34 */
 		OPCODE(o90_findAllObjectsWithClassOf),
-		OPCODE(o90_unknown35),
+		OPCODE(o90_getPolygonOverlap),
 		OPCODE(o90_unknown36),
 		OPCODE(o90_dim2dim2Array),
 		/* 38 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o90_unknown3A),
+		OPCODE(o90_sortArray),
 		OPCODE(o6_invalid),
 		/* 3C */
 		OPCODE(o6_invalid),
@@ -129,7 +129,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_writeWordVar),
 		/* 44 */
-		OPCODE(o90_unknown44),
+		OPCODE(o90_getObjectData),
 		OPCODE(o80_unknown45),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayWrite),
@@ -229,7 +229,7 @@
 		OPCODE(o6_findInventory),
 		OPCODE(o6_getInventoryCount),
 		/* 94 */
-		OPCODE(o90_unknown94),
+		OPCODE(o90_getPaletteData),
 		OPCODE(o6_beginOverride),
 		OPCODE(o6_endOverride),
 		OPCODE(o6_setObjectName),
@@ -241,7 +241,7 @@
 		/* 9C */
 		OPCODE(o72_roomOps),
 		OPCODE(o72_actorOps),
-		OPCODE(o90_unknown9E),
+		OPCODE(o90_paletteOps),
 		OPCODE(o6_getActorFromXY),
 		/* A0 */
 		OPCODE(o72_findObject),
@@ -1049,7 +1049,7 @@
 	push(readVar(0));
 }
 
-void ScummEngine_v90he::o90_unknown35() {
+void ScummEngine_v90he::o90_getPolygonOverlap() {
 	// Polygons related
 	int args[32];
 	int args2[32];
@@ -1072,7 +1072,7 @@
 	case 9:
 		break;
 	default:
-		error("o90_unknown35: default case %d", subOp);
+		error("o90_getPolygonOverlap: default case %d", subOp);
 	}
 	push(0);
 }
@@ -1129,7 +1129,7 @@
 	defineArray(fetchScriptWord(), data, dim2start, dim2end, dim1start, dim1end);
 }
 
-void ScummEngine_v90he::o90_unknown3A() {
+void ScummEngine_v90he::o90_sortArray() {
 	// Sorts array via qsort
 	int subOp = fetchScriptByte();
 
@@ -1143,12 +1143,12 @@
 		pop();
 		break;
 	default:
-		error("o90_unknown3A: Unknown case %d", subOp);
+		error("o90_sortArray: Unknown case %d", subOp);
 	}
-	debug(1,"o90_unknown3A stub (%d)", subOp);
+	debug(1,"o90_sortArray stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown44() {
+void ScummEngine_v90he::o90_getObjectData() {
 	// Object releated
 	int subOp = fetchScriptByte();
 	subOp -= 32;
@@ -1194,12 +1194,12 @@
 		push(0);
 		break;
 	default:
-		error("o90_unknown44: Unknown case %d", subOp);
+		error("o90_getObjectData: Unknown case %d", subOp);
 	}
-	debug(1,"o90_unknown44 stub (%d)", subOp);
+	debug(1,"o90_getObjectData stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown94() {
+void ScummEngine_v90he::o90_getPaletteData() {
 	int subOp = fetchScriptByte();
 	subOp -= 45;
 
@@ -1231,13 +1231,13 @@
 		pop();
 		break;
 	default:
-		error("o90_unknown94: Unknown case %d", subOp);
+		error("o90_getPaletteData: Unknown case %d", subOp);
 	}
 	push(0);
-	debug(1,"o90_unknown94 stub (%d)", subOp);
+	debug(1,"o90_getPaletteData stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown9E() {
+void ScummEngine_v90he::o90_paletteOps() {
 	int subOp = fetchScriptByte();
 	subOp -= 57;
 
@@ -1276,9 +1276,9 @@
 	case 198:
 		break;
 	default:
-		error("o90_unknown9E: Unknown case %d", subOp);
+		error("o90_paletteOps: Unknown case %d", subOp);
 	}
-	debug(1,"o90_unknown9E stub (%d)", subOp);
+	debug(1,"o90_paletteOps stub (%d)", subOp);
 }
 
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- scumm.cpp	1 Oct 2004 23:56:39 -0000	1.243
+++ scumm.cpp	4 Oct 2004 02:23:01 -0000	1.244
@@ -314,6 +314,8 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Global scripts increased to 2048
+	{"500demo", "Putt-Putt Enters the Race (Demo)", GID_FREDDI4, 6, 98, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"freddi4", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch", GID_FREDDI4, 6, 98, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"f4-demo", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Demo)", GID_FREDDI4, 6, 98, MDT_NONE,
@@ -540,6 +542,7 @@
 	_numSprites = 0;
 	_numTalkies = 0;
 	_numPalettes = 0;
+	_numUnk = 0;
 	_audioNames = NULL;
 	_numAudioNames = 0;
 	_curActor = 0;
@@ -835,6 +838,8 @@
 	VAR_NUM_CHARSETS = 0xFF;
 	VAR_NUM_GLOBAL_OBJS = 0xFF;
 	VAR_NUM_SPRITES = 0xFF;
+	VAR_NUM_PALETTES = 0xFF;
+	VAR_NUM_UNK = 0xFF;
 	VAR_POLYGONS_ONLY = 0xFF;
 	VAR_WINDOWS_VERSION = 0xFF;
 	VAR_WIZ_TCOLOR = 0xFF;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -d -r1.506 -r1.507
--- scumm.h	1 Oct 2004 11:23:00 -0000	1.506
+++ scumm.h	4 Oct 2004 02:23:02 -0000	1.507
@@ -495,7 +495,7 @@
 	int _numInventory;
 	int _numNewNames, _numGlobalScripts;
 	int _numActors, _numRoomVariables;
-	int _numPalettes, _numSprites, _numTalkies;
+	int _numPalettes, _numSprites, _numTalkies, _numUnk;
 public:
 	int _numLocalScripts, _numImages, _numRooms, _numScripts, _numSounds;	// Used by HE games
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette
@@ -1331,6 +1331,8 @@
 	byte VAR_NUM_CHARSETS;
 	byte VAR_NUM_GLOBAL_OBJS;
 	byte VAR_NUM_SPRITES;
+	byte VAR_NUM_PALETTES;
+	byte VAR_NUM_UNK;
 	byte VAR_POLYGONS_ONLY;
 	byte VAR_WINDOWS_VERSION;
 	byte VAR_WIZ_TCOLOR;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- vars.cpp	21 Sep 2004 12:44:34 -0000	1.107
+++ vars.cpp	4 Oct 2004 02:23:02 -0000	1.108
@@ -267,6 +267,10 @@
 		VAR_NUM_SPRITES = 106;
 		VAR_WIZ_TCOLOR = 117;
 	}
+	if (_heversion >= 99) {
+		VAR_NUM_PALETTES = 130;
+		VAR_NUM_UNK = 131;
+	}
 }
 
 void ScummEngine_v7::setupScummVars() {
@@ -504,6 +508,10 @@
 			VAR(VAR_WINDOWS_VERSION) = 40;
 		if (_heversion >= 90)
 			VAR(VAR_NUM_SPRITES) = _numSprites - 1;
+		if (_heversion >= 99) {
+			VAR(VAR_NUM_PALETTES) = _numPalettes;
+			VAR(VAR_NUM_UNK) = _numUnk;
+		}
 	} else {
 		VAR(VAR_CURRENTDRIVE) = 0;
 		switch (_midiDriver) {

More information about the Scummvm-git-logs mailing list