renamed some HE opcodes

svn-id: r15869

6 files changed, 44 insertions, 44 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index bf6d686034..dd12d10660 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -650,10 +650,10 @@ protected:
 	void o70_findObject();
 	void o70_quitPauseRestart();
 	void o70_kernelSetFunctions();
-	void o70_unknownED();
-	void o70_stringLen();
+	void o70_getStringWidth();
+	void o70_getStringLen();
 	void o70_unknownEF();
-	void o70_unknownF1();
+	void o70_stringCompare();
 	void o70_readINI();
 	void o70_writeINI();
 	void o70_unknownF5();
@@ -808,8 +808,8 @@ protected:
 	void loadWizCursor(int resId, int resType, bool state);
 	
 	/* HE version 80 script opcodes */
-	void o80_unknown45();
-	void o80_unknown48();
+	void o80_loadSBNG();
+	void o80_stringToInt();
 	void o80_getSoundVar();
 	void o80_localizeArrayToRoom();
 	void o80_readConfigFile();
@@ -899,8 +899,8 @@ protected:
 	void o90_getWizData();
 	void o90_unknown2F();
 	void o90_mod();
-	void o90_unknown31();
-	void o90_unknown32();
+	void o90_shl4();
+	void o90_shr4();
 	void o90_findAllObjectsWithClassOf();
 	void o90_getPolygonOverlap();
 	void o90_unknown36();
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 8a9c3e8a11..0878ce82e9 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -324,17 +324,17 @@ void ScummEngine_v100he::setupOpcodes() {
 		OPCODE(o6_startScriptQuick2),
 		OPCODE(o6_getState),
 		/* E0 */
-		OPCODE(o70_unknownF1),
+		OPCODE(o70_stringCompare),
 		OPCODE(o72_unknownEC),
 		OPCODE(o72_unknownEF),
 		OPCODE(o72_unknownF0),
 		/* E4 */
-		OPCODE(o70_stringLen),
+		OPCODE(o70_getStringLen),
 		OPCODE(o70_unknownF5),
 		OPCODE(o6_invalid),
 		OPCODE(o70_unknownF6),
 		/* E8 */
-		OPCODE(o70_unknownED),
+		OPCODE(o70_getStringWidth),
 		OPCODE(o60_readFilePos),
 		OPCODE(o72_getTimer),
 		OPCODE(o6_getVerbEntrypoint),
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 84e389dcb5..c4eda07719 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -341,12 +341,12 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o60_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
-		OPCODE(o70_unknownED),
-		OPCODE(o70_stringLen),
+		OPCODE(o70_getStringWidth),
+		OPCODE(o70_getStringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
-		OPCODE(o70_unknownF1),
+		OPCODE(o70_stringCompare),
 		OPCODE(o72_checkGlobQueue),
 		OPCODE(o72_readINI),
 		/* F4 */
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 0cbdbc9e50..458a38fc17 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -342,12 +342,12 @@ void ScummEngine_v70he::setupOpcodes() {
 		OPCODE(o60_readFilePos),
 		/* EC */
 		OPCODE(o6_invalid),
-		OPCODE(o70_unknownED),
-		OPCODE(o70_stringLen),
+		OPCODE(o70_getStringWidth),
+		OPCODE(o70_getStringLen),
 		OPCODE(o70_unknownEF),
 		/* F0 */
 		OPCODE(o6_invalid),
-		OPCODE(o70_unknownF1),
+		OPCODE(o70_stringCompare),
 		OPCODE(o6_invalid),
 		OPCODE(o70_readINI),
 		/* F4 */
@@ -718,7 +718,7 @@ void ScummEngine_v70he::o70_quitPauseRestart() {
 	}
 }
 
-void ScummEngine_v70he::o70_unknownED() {
+void ScummEngine_v70he::o70_getStringWidth() {
 	int array, pos, len;
 	int chr, width = 0;
 
@@ -741,7 +741,7 @@ void ScummEngine_v70he::o70_unknownED() {
 	}
 
 	push(width);
-	debug(1,"stub o70_unknownED (%d)", width);
+	debug(1,"stub o70_getStringWidth (%d)", width);
 }
 
 void ScummEngine_v70he::o70_kernelSetFunctions() {
@@ -799,7 +799,7 @@ void ScummEngine_v70he::o70_kernelSetFunctions() {
 	}
 }
 
-void ScummEngine_v70he::o70_stringLen() {
+void ScummEngine_v70he::o70_getStringLen() {
 	int id, len;
 	byte *addr;
 
@@ -807,7 +807,7 @@ void ScummEngine_v70he::o70_stringLen() {
 
 	addr = getStringAddress(id);
 	if (!addr)
-		error("o70_stringLen: Reference to zeroed array pointer (%d)", id);
+		error("o70_getStringLen: Reference to zeroed array pointer (%d)", id);
 
 	len = resStrLen(getStringAddress(id));
 	push(len);
@@ -834,7 +834,7 @@ void ScummEngine_v70he::o70_unknownEF() {
 	debug(1,"stub o70_unknownEF");
 }
 
-void ScummEngine_v70he::o70_unknownF1() {
+void ScummEngine_v70he::o70_stringCompare() {
 	byte *addr, *addr2;
 	int i = 0;
 
@@ -843,11 +843,11 @@ void ScummEngine_v70he::o70_unknownF1() {
 
 	addr = getStringAddress(id);
 	if (!addr)
-		error("o70_unknownF1: Reference to zeroed array pointer (%d)", id);
+		error("o70_stringCompare: Reference to zeroed array pointer (%d)", id);
 
 	addr2 = getStringAddress(id2);
 	if (!addr2)
-		error("o70_unknownF1: Reference to zeroed array pointer (%d)", id);
+		error("o70_stringCompare: Reference to zeroed array pointer (%d)", id);
 
 	while(1) {
 		if (*addr != *addr2)
@@ -873,7 +873,7 @@ void ScummEngine_v70he::o70_unknownF1() {
 	}
 
 	push (i);
-	debug(1,"o70_unknownF1 stub (%d, %d, %d)", id, id2, i);
+	debug(1,"o70_stringCompare stub (%d, %d, %d)", id, id2, i);
 }
 
 void ScummEngine_v70he::o70_readINI() {
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index be82d5054e..9d6d6b94cf 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -130,11 +130,11 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_writeWordVar),
 		/* 44 */
 		OPCODE(o6_invalid),
-		OPCODE(o80_unknown45),
+		OPCODE(o80_loadSBNG),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayWrite),
 		/* 48 */
-		OPCODE(o80_unknown48),
+		OPCODE(o80_stringToInt),
 		OPCODE(o80_getSoundVar),
 		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
@@ -340,12 +340,12 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o60_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
-		OPCODE(o70_unknownED),
-		OPCODE(o70_stringLen),
+		OPCODE(o70_getStringWidth),
+		OPCODE(o70_getStringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
-		OPCODE(o70_unknownF1),
+		OPCODE(o70_stringCompare),
 		OPCODE(o72_checkGlobQueue),
 		OPCODE(o72_readINI),
 		/* F4 */
@@ -377,7 +377,7 @@ const char *ScummEngine_v80he::getOpcodeDesc(byte i) {
 	return _opcodesV80he[i].desc;
 }
 
-void ScummEngine_v80he::o80_unknown45() {
+void ScummEngine_v80he::o80_loadSBNG() {
 	// Loads SBNG sound resource
 	byte subOp = fetchScriptByte();
 
@@ -393,12 +393,12 @@ void ScummEngine_v80he::o80_unknown45() {
 		//_heSBNGId = pop();
 		break;
 	default:
-		warning("o80_unknown45: default case %d", subOp);
+		warning("o80_loadSBNG: default case %d", subOp);
 	}
-	debug(1,"o80_unknown45 stub (%d)",subOp);
+	debug(1,"o80_loadSBNG stub (%d)",subOp);
 }
 
-void ScummEngine_v80he::o80_unknown48() {
+void ScummEngine_v80he::o80_stringToInt() {
 	int id, len, val;
 	byte *addr;
 	char string[100];
@@ -407,7 +407,7 @@ void ScummEngine_v80he::o80_unknown48() {
 
 	addr = getStringAddress(id);
 	if (!addr)
-		error("o80_unknown48: Reference to zeroed array pointer (%d)", id);
+		error("o80_stringToInt: Reference to zeroed array pointer (%d)", id);
 
 	len = resStrLen(getStringAddress(id)) + 1;
 	memcpy(string, addr, len);
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 9be6c21d74..37d9daf763 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -105,8 +105,8 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o90_unknown2F),
 		/* 30 */
 		OPCODE(o90_mod),
-		OPCODE(o90_unknown31),
-		OPCODE(o90_unknown32),
+		OPCODE(o90_shl4),
+		OPCODE(o90_shr4),
 		OPCODE(o6_invalid),
 		/* 34 */
 		OPCODE(o90_findAllObjectsWithClassOf),
@@ -130,11 +130,11 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_writeWordVar),
 		/* 44 */
 		OPCODE(o90_getObjectData),
-		OPCODE(o80_unknown45),
+		OPCODE(o80_loadSBNG),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayWrite),
 		/* 48 */
-		OPCODE(o80_unknown48),
+		OPCODE(o80_stringToInt),
 		OPCODE(o80_getSoundVar),
 		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
@@ -340,12 +340,12 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o60_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
-		OPCODE(o70_unknownED),
-		OPCODE(o70_stringLen),
+		OPCODE(o70_getStringWidth),
+		OPCODE(o70_getStringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
-		OPCODE(o70_unknownF1),
+		OPCODE(o70_stringCompare),
 		OPCODE(o72_checkGlobQueue),
 		OPCODE(o72_readINI),
 		/* F4 */
@@ -1217,7 +1217,7 @@ int ScummEngine_v90he::isWizPixelNonTransparent(int restype, int resnum, int sta
 		if (c == 1) {
 			ret = gdi.isWizPixelNonTransparent(wizd, x, y, w, h);
 		} else if (c == 0 || c == 2 || c == 3) {
-			ret = gdi.getRawWizPixelColor(wizd, x, y, w, h, VAR(VAR_WIZ_TCOLOR)) != VAR(VAR_WIZ_TCOLOR);
+			ret = gdi.getRawWizPixelColor(wizd, x, y, w, h, VAR(VAR_WIZ_TCOLOR)) != VAR(VAR_WIZ_TCOLOR) ? 1 : 0;
 		}
 	}
 	return ret;
@@ -1384,12 +1384,12 @@ void ScummEngine_v90he::o90_unknown2F() {
 	debug(1,"o90_unknown2F stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_unknown31() {
+void ScummEngine_v90he::o90_shl4() {
 	int a = pop() << 2;
 	push(pop() << a);
 }
 
-void ScummEngine_v90he::o90_unknown32() {
+void ScummEngine_v90he::o90_shr4() {
 	int a = pop() << 2;
 	push(pop() >> a);
 }