Rename opcodes

svn-id: r15502

7 files changed, 45 insertions, 28 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index e62fe433b9..1245924222 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -593,7 +593,7 @@ protected:
 	void o60_writeFile();
 	void o60_soundOps();
 	void o60_seekFilePos();
-	void o60_localizeArray();
+	void o60_localizeArrayToScript();
 	void o60_redimArray();
 	void o60_readFilePos();
 };
@@ -805,7 +805,7 @@ protected:
 	void o80_unknown45();
 	void o80_unknown48();
 	void o80_unknown49();
-	void o80_unknown4A();
+	void o80_localizeArrayToRoom();
 	void o80_readConfigFile();
 	void o80_writeConfigFile();
 	void o80_cursorCommand();
@@ -878,7 +878,8 @@ protected:
 	void o90_sqrt();
 	void o90_atan2();
 	void o90_getSegmentAngle();
-	void o90_startLocalScript();
+	void o90_startScriptUnk();
+	void o90_jumpToScriptUnk();
 	void o90_wizImageOps();
 	void o90_unknown25();
 	void o90_unknown26();
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index d5bcf30c4e..92ba728f55 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -122,7 +122,7 @@ void ScummEngine_v100he::setupOpcodes() {
 		OPCODE(o70_kernelSetFunctions),
 		OPCODE(o6_land),
 		OPCODE(o6_le),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		/* 40 */
 		OPCODE(o6_wordArrayRead),
 		OPCODE(o6_wordArrayIndexedRead),
@@ -155,9 +155,9 @@ void ScummEngine_v100he::setupOpcodes() {
 		OPCODE(o6_printSystem),
 		/* 58 */
 		OPCODE(o6_printCursor),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o90_jumpToScriptUnk),
+		OPCODE(o90_startScriptUnk),
+		OPCODE(o6_pseudoRoom),
 		/* 5C */
 		OPCODE(o6_pushByte),
 		OPCODE(o72_pushDWord),
@@ -172,7 +172,7 @@ void ScummEngine_v100he::setupOpcodes() {
 		OPCODE(o100_redimArray),
 		OPCODE(o60_rename),
 		OPCODE(o6_stopObjectCode),
-		OPCODE(o6_invalid),
+		OPCODE(o80_localizeArrayToRoom),
 		/* 68 */
 		OPCODE(o100_roomOps),
 		OPCODE(o6_printActor),
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index e6119506ed..4cda08399e 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -350,7 +350,7 @@ void ScummEngine_v60he::setupOpcodes() {
 		/* E0 */
 		OPCODE(o60_soundOps),
 		OPCODE(o6_getPixel),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -1174,12 +1174,12 @@ void ScummEngine_v60he::o60_soundOps() {
 
 void ScummEngine_v60he::localizeArray(int slot, byte script) {
 	if (slot >= _numArray)
-		error("o60_localizeArray(%d): array slot out of range", slot);
+		error("o60_localizeArrayToScript(%d): array slot out of range", slot);
 
 	_arraySlot[slot] = script;
 }
 
-void ScummEngine_v60he::o60_localizeArray() {
+void ScummEngine_v60he::o60_localizeArrayToScript() {
 	int slot = pop();
 	localizeArray(slot, vm.slot[_currentScript].number);
 }
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index d740711b3d..e8a9f3e7bd 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -327,7 +327,7 @@ void ScummEngine_v72he::setupOpcodes() {
 		/* E0 */
 		OPCODE(o60_soundOps),
 		OPCODE(o72_getPixel),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		OPCODE(o72_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -825,19 +825,20 @@ void ScummEngine_v72he::o72_unknown5A() {
 
 void ScummEngine_v72he::o72_startScript() {
 	int args[16];
-	int script, flags;
+	int script;
+	byte flags;
 
 	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	flags = fetchScriptByte();
-	
 	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
 }
 
 void ScummEngine_v72he::o72_startObject() {
 	int args[16];
 	int script, entryp;
-	int flags;
+	byte flags;
+
 	getStackList(args, ARRAYSIZE(args));
 	entryp = pop();
 	script = pop();
@@ -1911,7 +1912,8 @@ void ScummEngine_v72he::o72_unknownCF() {
 
 void ScummEngine_v72he::o72_jumpToScript() {
 	int args[16];
-	int script, flags;
+	int script;
+	byte flags;
 
 	getStackList(args, ARRAYSIZE(args));
 	script = pop();
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 24c75858b0..c812678ade 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -328,7 +328,7 @@ void ScummEngine_v70he::setupOpcodes() {
 		/* E0 */
 		OPCODE(o60_soundOps),
 		OPCODE(o6_getPixel),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 331589d93c..679b4e1092 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -136,7 +136,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		/* 48 */
 		OPCODE(o80_unknown48),
 		OPCODE(o80_unknown49),
-		OPCODE(o80_unknown4A),
+		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),
@@ -326,7 +326,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		/* E0 */
 		OPCODE(o80_unknownE0),
 		OPCODE(o72_getPixel),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		OPCODE(o80_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -438,7 +438,7 @@ void ScummEngine_v80he::o80_unknown49() {
 	debug(1,"o80_unknown49 stub (%d, %d)", subOp, snd);
 }
 
-void ScummEngine_v80he::o80_unknown4A() {
+void ScummEngine_v80he::o80_localizeArrayToRoom() {
 	int slot = pop();
 	localizeArray(slot, 0xFFFFFFFF);
 }
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index ce917e4834..4c07bc3686 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -97,9 +97,9 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o90_unknown28),
 		OPCODE(o90_unknown29),
 		OPCODE(o6_invalid),
-		OPCODE(o90_startLocalScript),
+		OPCODE(o90_startScriptUnk),
 		/* 2C */
-		OPCODE(o6_invalid),
+		OPCODE(o90_jumpToScriptUnk),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o90_unknown2F),
@@ -136,7 +136,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		/* 48 */
 		OPCODE(o80_unknown48),
 		OPCODE(o80_unknown49),
-		OPCODE(o80_unknown4A),
+		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),
@@ -326,7 +326,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		/* E0 */
 		OPCODE(o80_unknownE0),
 		OPCODE(o72_getPixel),
-		OPCODE(o60_localizeArray),
+		OPCODE(o60_localizeArrayToScript),
 		OPCODE(o80_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -451,14 +451,28 @@ void ScummEngine_v90he::o90_getSegmentAngle() {
 	push(a);
 }
 
-void ScummEngine_v90he::o90_startLocalScript() {
+void ScummEngine_v90he::o90_startScriptUnk() {
+	int args[16];
+	int script, cycle;
+	byte flags;
+
+	getStackList(args, ARRAYSIZE(args));
+	cycle = pop();
+	script = pop();
+	flags = fetchScriptByte();
+	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
+}
+
+void ScummEngine_v90he::o90_jumpToScriptUnk() {
 	int args[16];
-	int script, entryp;
-	int flags;
+	int script, cycle;
+	byte flags;
+
 	getStackList(args, ARRAYSIZE(args));
-	entryp = pop();
+	cycle = pop();
 	script = pop();
 	flags = fetchScriptByte();
+	stopObjectCode();
 	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
 }