[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.278,2.279 script_v72he.cpp,2.142,2.143 script_v80he.cpp,2.43,2.44 script_v90he.cpp,2.65,2.66

[Travis Howell]

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

Modified Files:
	intern.h script_v72he.cpp script_v80he.cpp script_v90he.cpp 
Log Message:

That was duplicate


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.278
retrieving revision 2.279
diff -u -d -r2.278 -r2.279
--- intern.h	1 Oct 2004 23:56:39 -0000	2.278
+++ intern.h	2 Oct 2004 00:12:09 -0000	2.279
@@ -898,7 +898,6 @@
 	void o90_unknown9E();
 	void o90_unknownA5();
 	void o90_getActorAnimProgress();
-	void o90_unknownCF();
 };
 
 class ScummEngine_v7 : public ScummEngine_v6 {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.142
retrieving revision 2.143
diff -u -d -r2.142 -r2.143
--- script_v72he.cpp	30 Sep 2004 22:39:13 -0000	2.142
+++ script_v72he.cpp	2 Oct 2004 00:12:09 -0000	2.143
@@ -1826,19 +1826,14 @@
 }
 
 void ScummEngine_v72he::o72_unknownCF() {
-	//ArrayHeader *ah;
 	byte string[255];
 
 	copyScriptString(string);
-	int len = resStrLen(string) + 1;
-
 	writeVar(0, 0);
-	//ah = defineArray(0, kStringArray, 0, 0, 0, len);
-	defineArray(0, kStringArray, 0, 0, 0, len);
+	defineArray(0, kStringArray, 0, 0, 0, 0);
 	writeArray(0, 0, 0, 0);
-	//memcpy(ah->data, string, len);
-
 	push(readVar(0));
+	debug(1,"o72_unknownCF: String %s", string);
 }
 
 void ScummEngine_v72he::o72_jumpToScript() {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.43
retrieving revision 2.44
diff -u -d -r2.43 -r2.44
--- script_v80he.cpp	1 Oct 2004 23:56:39 -0000	2.43
+++ script_v80he.cpp	2 Oct 2004 00:12:09 -0000	2.44
@@ -302,7 +302,7 @@
 		OPCODE(o6_pickOneOfDefault),
 		OPCODE(o6_stampObject),
 		OPCODE(o72_drawWizImage),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknownCF),
 		/* D0 */
 		OPCODE(o6_getDateTime),
 		OPCODE(o6_stopTalking),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.65
retrieving revision 2.66
diff -u -d -r2.65 -r2.66
--- script_v90he.cpp	1 Oct 2004 23:56:39 -0000	2.65
+++ script_v90he.cpp	2 Oct 2004 00:12:09 -0000	2.66
@@ -302,7 +302,7 @@
 		OPCODE(o6_pickOneOfDefault),
 		OPCODE(o6_stampObject),
 		OPCODE(o72_drawWizImage),
-		OPCODE(o90_unknownCF),
+		OPCODE(o72_unknownCF),
 		/* D0 */
 		OPCODE(o6_getDateTime),
 		OPCODE(o6_stopTalking),
@@ -1187,14 +1187,4 @@
 	push(a->getAnimProgress());
 }
 
-void ScummEngine_v90he::o90_unknownCF() {
-	byte name[255];
-
-	copyScriptString(name);
-	writeVar(0, 0);
-	defineArray(0, kStringArray, 0, 0, 0, 0);
-	writeArray(0, 0, 0, 0);
-	push(readVar(0));
-}
-
 } // End of namespace Scumm