[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.334,2.335 script_v100he.cpp,2.48,2.49 script_v90he.cpp,2.125,2.126

[kirben]

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

Modified Files:
	intern.h script_v100he.cpp script_v90he.cpp 
Log Message:

Rename opcodes, names should be correct.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.334
retrieving revision 2.335
diff -u -d -r2.334 -r2.335
--- intern.h	14 Feb 2005 08:58:02 -0000	2.334
+++ intern.h	20 Feb 2005 11:14:50 -0000	2.335
@@ -883,10 +883,10 @@
 	void o90_jumpToScriptUnk();
 	void o90_wizImageOps();
 	void o90_getDistanceBetweenPoints();
-	void o90_unknown25();
-	void o90_unknown26();
-	void o90_unknown27();
-	void o90_unknown28();
+	void o90_getSpriteInfo();
+	void o90_setSpriteInfo();
+	void o90_getSpriteGroupInfo();
+	void o90_setSpriteGroupInfo();
 	void o90_getWizData();
 	void o90_unknown2F();
 	void o90_mod();
@@ -933,7 +933,7 @@
 	void o100_redim2dimArray();
 	void o100_dimArray();
 	void o100_drawObject();
-	void o100_unknown28();
+	void o100_setSpriteGroupInfo();
 	void o100_resourceRoutines();
 	void o100_wizImageOps();
 	void o100_loadSBNG();
@@ -942,16 +942,16 @@
 	void o100_redimArray();
 	void o100_roomOps();
 	void o100_startSound();
-	void o100_unknown26();
+	void o100_setSpriteInfo();
 	void o100_quitPauseRestart();
 	void o100_cursorCommand();
 	void o100_wait();
 	void o100_writeFile();
 	void o100_getResourceSize();
-	void o100_unknown27();
+	void o100_getSpriteGroupInfo();
 	void o100_getPaletteData();
 	void o100_readFile();
-	void o100_unknown25();
+	void o100_getSpriteInfo();
 	void o100_getWizData();
 };
 

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.48
retrieving revision 2.49
diff -u -d -r2.48 -r2.49
--- script_v100he.cpp	14 Feb 2005 21:18:59 -0000	2.48
+++ script_v100he.cpp	20 Feb 2005 11:14:50 -0000	2.49
@@ -103,7 +103,7 @@
 		/* 30 */
 		OPCODE(o6_ge),
 		OPCODE(o6_getDateTime),
-		OPCODE(o100_unknown28),
+		OPCODE(o100_setSpriteGroupInfo),
 		OPCODE(o6_gt),
 		/* 34 */
 		OPCODE(o100_resourceRoutines),
@@ -192,7 +192,7 @@
 		OPCODE(o100_startSound),
 		/* 78 */
 		OPCODE(o6_invalid),
-		OPCODE(o100_unknown26),
+		OPCODE(o100_setSpriteInfo),
 		OPCODE(o6_stampObject),
 		OPCODE(o72_startObject),
 		/* 7C */
@@ -271,7 +271,7 @@
 		OPCODE(o72_checkGlobQueue),
 		OPCODE(o100_getResourceSize),
 		/* B8 */
-		OPCODE(o100_unknown27),
+		OPCODE(o100_getSpriteGroupInfo),
 		OPCODE(o6_invalid),
 		OPCODE(o100_getWizData),
 		OPCODE(o6_isActorInBox),
@@ -314,7 +314,7 @@
 		OPCODE(o72_getSoundElapsedTimeOfSound),
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o80_getSoundVar),
-		OPCODE(o100_unknown25),
+		OPCODE(o100_getSpriteInfo),
 		/* DC */
 		OPCODE(o90_sqrt),
 		OPCODE(o6_startObjectQuick),
@@ -831,7 +831,7 @@
 	}
 }
 
-void ScummEngine_v100he::o100_unknown28() {
+void ScummEngine_v100he::o100_setSpriteGroupInfo() {
 	byte string[260];
 
 	byte subOp = fetchScriptByte();
@@ -877,7 +877,7 @@
 			pop();
 			break;
 		default:
-			error("o100_unknown28 subOp 38: Unknown case %d", subOp);
+			error("o100_setSpriteGroupInfo subOp 38: Unknown case %d", subOp);
 		}
 		break;
 	case 40:
@@ -906,9 +906,9 @@
 	case 89:
 		break;
 	default:
-		error("o100_unknown28: Unknown case %d", subOp);
+		error("o100_setSpriteGroupInfo: Unknown case %d", subOp);
 	}
-	debug(1,"o100_unknown28 stub (%d)", subOp);
+	debug(1,"o100_setSpriteGroupInfo stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_resourceRoutines() {
@@ -1498,7 +1498,7 @@
 	}
 }
 
-void ScummEngine_v100he::o100_unknown26() {
+void ScummEngine_v100he::o100_setSpriteInfo() {
 	int args[16];
 	byte string[80];
 
@@ -1597,9 +1597,9 @@
 	case 89:
 		break;
 	default:
-		error("o100_unknown26: Unknown case %d", subOp);
+		error("o100_setSpriteInfo: Unknown case %d", subOp);
 	}
-	debug(1,"o100_unknown26 stub (%d)", subOp);
+	debug(1,"o100_setSpriteInfo stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_quitPauseRestart() {
@@ -1788,7 +1788,7 @@
 	push(size);
 }
 
-void ScummEngine_v100he::o100_unknown27() {
+void ScummEngine_v100he::o100_getSpriteGroupInfo() {
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
 	case 5:
@@ -1815,11 +1815,11 @@
 		pop();
 		break;
 	default:
-		error("o100_unknown27: Unknown case %d", subOp);
+		error("o100_getSpriteGroupInfo: Unknown case %d", subOp);
 	}
 	push(0);
 
-	debug(1,"o100_unknown27 stub (%d)", subOp);
+	debug(1,"o100_getSpriteGroupInfo stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_getWizData() {
@@ -1976,7 +1976,7 @@
 	debug(1, "o100_readFile: slot %d, subOp %d val %d", slot, subOp, val);
 }
 
-void ScummEngine_v100he::o100_unknown25() {
+void ScummEngine_v100he::o100_getSpriteInfo() {
 	int args[16];
 
 	byte subOp = fetchScriptByte();
@@ -2072,10 +2072,10 @@
 		pop();
 		break;
 	default:
-		error("o100_unknown25: Unknown case %d", subOp);
+		error("o100_getSpriteInfo: Unknown case %d", subOp);
 	}
 	push(0);
-	debug(1,"o100_unknown25 stub (%d)", subOp);
+	debug(1,"o100_getSpriteInfo stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::decodeParseString(int m, int n) {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.125
retrieving revision 2.126
diff -u -d -r2.125 -r2.126
--- script_v90he.cpp	14 Feb 2005 07:15:16 -0000	2.125
+++ script_v90he.cpp	20 Feb 2005 11:14:50 -0000	2.126
@@ -87,11 +87,11 @@
 		OPCODE(o90_getSegmentAngle),
 		/* 24 */
 		OPCODE(o90_getDistanceBetweenPoints),
-		OPCODE(o90_unknown25), // o90_getSpriteInfo
-		OPCODE(o90_unknown26), // o90_setSpriteInfo
-		OPCODE(o90_unknown27), // o90_getSpriteGroupInfo
+		OPCODE(o90_getSpriteInfo),
+		OPCODE(o90_setSpriteInfo),
+		OPCODE(o90_getSpriteGroupInfo),
 		/* 28 */
-		OPCODE(o90_unknown28), // o90_setSpriteGroupInfo
+		OPCODE(o90_setSpriteGroupInfo),
 		OPCODE(o90_getWizData),
 		OPCODE(o6_invalid),
 		OPCODE(o90_startScriptUnk),
@@ -696,12 +696,12 @@
 	}
 }
 
-void ScummEngine_v90he::o90_unknown25() {
+void ScummEngine_v90he::o90_getSpriteInfo() {
 	int args[16];
 	byte subOp = fetchScriptByte();
 	subOp -= 30;
 
-	debug(1,"o90_unknown25 stub (%d)", subOp);
+	debug(1,"o90_getSpriteInfo stub (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		pop();
@@ -791,12 +791,12 @@
 		pop();
 		break;
 	default:
-		error("o90_unknown25: Unknown case %d", subOp);
+		error("o90_getSpriteInfo: Unknown case %d", subOp);
 	}
 	push(0);
 }
 
-void ScummEngine_v90he::o90_unknown26() {
+void ScummEngine_v90he::o90_setSpriteInfo() {
 	int args[16];
 	byte subOp = fetchScriptByte();
 	subOp -= 34;
@@ -887,12 +887,12 @@
 	case 183:
 		break;
 	default:
-		error("o90_unknown26: Unknown case %d", subOp);
+		error("o90_setSpriteInfo: Unknown case %d", subOp);
 	}
-	debug(1,"o90_unknown26 stub (%d)", subOp);
+	debug(1,"o90_setSpriteInfo stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown27() {
+void ScummEngine_v90he::o90_getSpriteGroupInfo() {
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
 	case 8: // HE 99+
@@ -919,14 +919,14 @@
 		pop();
 		break;
 	default:
-		error("o90_unknown27: Unknown case %d", subOp);
+		error("o90_getSpriteGroupInfo: Unknown case %d", subOp);
 	}
 	push(0);
 
-	debug(1,"o90_unknown27 stub (%d)", subOp);
+	debug(1,"o90_getSpriteGroupInfo stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown28() {
+void ScummEngine_v90he::o90_setSpriteGroupInfo() {
 	byte subOp = fetchScriptByte();
 	subOp -= 37;
 
@@ -958,7 +958,7 @@
 			pop();
 			break;
 		default:
-			error("o90_unknown28 subOp 0: Unknown case %d", subOp);
+			error("o90_setSpriteGroupInfo subOp 0: Unknown case %d", subOp);
 		}
 		break;
 	case 5:
@@ -993,9 +993,9 @@
 	case 180:
 		break;
 	default:
-		error("o90_unknown28: Unknown case %d", subOp);
+		error("o90_setSpriteGroupInfo: Unknown case %d", subOp);
 	}
-	debug(1,"o90_unknown28 stub (%d)", subOp);
+	debug(1,"o90_setSpriteGroupInfo stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_getWizData() {