[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.539,2.540 script_v72he.cpp,2.315,2.316 script_v7he.cpp,2.169,2.170 script_v80he.cpp,2.128,2.129 script_v90he.cpp,2.289,2.290 scumm-md5.h,2.126,2.127

[kirben]

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

Modified Files:
	intern.h script_v72he.cpp script_v7he.cpp script_v80he.cpp 
	script_v90he.cpp scumm-md5.h 
Log Message:

Opcode is used by HE71 too.
Freddi version should be all languages (Used by English and Russian).


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.539
retrieving revision 2.540
diff -u -d -r2.539 -r2.540
--- intern.h	2 Nov 2005 21:47:42 -0000	2.539
+++ intern.h	16 Nov 2005 05:08:11 -0000	2.540
@@ -898,6 +898,7 @@
 	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 @@
 	void o72_getPixel();
 	void o72_pickVarRandom();
 	void o72_redimArray();
-	void o72_isResourceLoaded();
 	void o72_readINI();
 	void o72_writeINI();
 	void o72_getResourceSize();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.315
retrieving revision 2.316
diff -u -d -r2.315 -r2.316
--- script_v72he.cpp	15 Nov 2005 22:50:14 -0000	2.315
+++ script_v72he.cpp	16 Nov 2005 05:08:11 -0000	2.316
@@ -346,7 +346,7 @@
 		/* 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::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;

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.169
retrieving revision 2.170
diff -u -d -r2.169 -r2.170
--- script_v7he.cpp	6 Nov 2005 11:29:08 -0000	2.169
+++ script_v7he.cpp	16 Nov 2005 05:08:11 -0000	2.170
@@ -909,6 +909,36 @@
 	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;

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.128
retrieving revision 2.129
diff -u -d -r2.128 -r2.129
--- script_v80he.cpp	6 Nov 2005 11:33:58 -0000	2.128
+++ script_v80he.cpp	16 Nov 2005 05:08:11 -0000	2.129
@@ -345,7 +345,7 @@
 		/* F0 */
 		OPCODE(o70_concatString),
 		OPCODE(o70_compareString),
-		OPCODE(o72_isResourceLoaded),
+		OPCODE(o70_isResourceLoaded),
 		OPCODE(o72_readINI),
 		/* F4 */
 		OPCODE(o72_writeINI),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.289
retrieving revision 2.290
diff -u -d -r2.289 -r2.290
--- script_v90he.cpp	6 Nov 2005 11:29:08 -0000	2.289
+++ script_v90he.cpp	16 Nov 2005 05:08:11 -0000	2.290
@@ -343,7 +343,7 @@
 		/* F0 */
 		OPCODE(o70_concatString),
 		OPCODE(o70_compareString),
-		OPCODE(o72_isResourceLoaded),
+		OPCODE(o70_isResourceLoaded),
 		OPCODE(o72_readINI),
 		/* F4 */
 		OPCODE(o72_writeINI),

Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.126
retrieving revision 2.127
diff -u -d -r2.126 -r2.127
--- scumm-md5.h	16 Nov 2005 03:57:17 -0000	2.126
+++ scumm-md5.h	16 Nov 2005 05:08:11 -0000	2.127
@@ -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 @@
 	{ "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 },