Opcode is used by HE71 too.

Freddi version should be all languages (Used by English and Russian).

svn-id: r19610

6 files changed, 36 insertions, 36 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index 37dcb24cc3..fe8085b5d0 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -898,6 +898,7 @@ protected:
 	void o70_appendString();
 	void o70_concatString();
 	void o70_compareString();
+	void o70_isResourceLoaded();
 	void o70_readINI();
 	void o70_writeINI();
 	void o70_getStringLenForWidth();
@@ -1051,7 +1052,6 @@ protected:
 	void o72_getPixel();
 	void o72_pickVarRandom();
 	void o72_redimArray();
-	void o72_isResourceLoaded();
 	void o72_readINI();
 	void o72_writeINI();
 	void o72_getResourceSize();
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 207d60bf97..a8ca787d17 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -346,7 +346,7 @@ void ScummEngine_v72he::setupOpcodes() {
 		/* F0 */
 		OPCODE(o70_concatString),
 		OPCODE(o70_compareString),
-		OPCODE(o72_isResourceLoaded),
+		OPCODE(o70_isResourceLoaded),
 		OPCODE(o72_readINI),
 		/* F4 */
 		OPCODE(o72_writeINI),
@@ -2138,36 +2138,6 @@ void ScummEngine_v72he::copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int
 	}
 }
 
-void ScummEngine_v72he::o72_isResourceLoaded() {
-	// Reports percentage of resource loaded by queue
-	int type;
-
-	byte subOp = fetchScriptByte();
-	/* int idx = */ pop();
-
-	switch (subOp) {
-	case 18:
-		type = rtImage;
-		break;
-	case 226:
-		type = rtRoom;
-		break;
-	case 227:
-		type = rtCostume;
-		break;
-	case 228:
-		type = rtSound;
-		break;
-	case 229:
-		type = rtScript;
-		break;
-	default:
-		error("o72_isResourceLoaded: default case %d", subOp);
-	}
-
-	push(100);
-}
-
 void ScummEngine_v72he::o72_readINI() {
 	byte option[128];
 	ArrayHeader *ah;
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 0270a055bb..e5d5a13567 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -909,6 +909,36 @@ void ScummEngine_v70he::o70_compareString() {
 	push(result);
 }
 
+void ScummEngine_v70he::o70_isResourceLoaded() {
+	// Reports percentage of resource loaded by queue
+	int type;
+
+	byte subOp = fetchScriptByte();
+	/* int idx = */ pop();
+
+	switch (subOp) {
+	case 18:
+		type = rtImage;
+		break;
+	case 226:
+		type = rtRoom;
+		break;
+	case 227:
+		type = rtCostume;
+		break;
+	case 228:
+		type = rtSound;
+		break;
+	case 229:
+		type = rtScript;
+		break;
+	default:
+		error("o70_isResourceLoaded: default case %d", subOp);
+	}
+
+	push(100);
+}
+
 void ScummEngine_v70he::o70_readINI() {
 	byte option[256];
 	ArrayHeader *ah;
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 7c41b3517c..600b22bf1e 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -345,7 +345,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		/* F0 */
 		OPCODE(o70_concatString),
 		OPCODE(o70_compareString),
-		OPCODE(o72_isResourceLoaded),
+		OPCODE(o70_isResourceLoaded),
 		OPCODE(o72_readINI),
 		/* F4 */
 		OPCODE(o72_writeINI),
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 63775e2d21..5b6eddecbb 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -343,7 +343,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		/* F0 */
 		OPCODE(o70_concatString),
 		OPCODE(o70_compareString),
-		OPCODE(o72_isResourceLoaded),
+		OPCODE(o70_isResourceLoaded),
 		OPCODE(o72_readINI),
 		/* F4 */
 		OPCODE(o72_writeINI),
diff --git a/scumm/scumm-md5.h b/scumm/scumm-md5.h
index 50fccd2453..2299e99fde 100644
--- a/scumm/scumm-md5.h
+++ b/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Wed Nov 16 03:55:36 2005
+  This file was generated by the md5table tool on Wed Nov 16 05:02:50 2005
   DO NOT EDIT MANUALLY!
  */
 
@@ -363,7 +363,7 @@ static const MD5Table md5table[] = {
 	{ "d43352a805d78b5f4936c6d7779bf575", "samnmax", Common::RU_RUS, Common::kPlatformPC },
 	{ "d4aac997e2f4e15341f0bfbf905419bd", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
 	{ "d4b8ee426b1afd3e53bc0cf020418cf6", "dog", Common::EN_USA, Common::kPlatformWindows },
-	{ "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", Common::RU_RUS, Common::kPlatformWindows },
+	{ "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", Common::UNK_LANG, Common::kPlatformWindows },
 	{ "d4e79c3d8645b8266cd78c325bc35154", "pajama2", Common::EN_USA, Common::kPlatformUnknown },
 	{ "d55eff37c2100f5065cde9de428621fa", "zak", Common::EN_USA, Common::kPlatformAtariST },
 	{ "d62047a6729349ab36f7ee065bf26509", "dig", Common::RU_RUS, Common::kPlatformUnknown },