[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.527,2.528 script_c64.cpp,2.23,2.24

[kirben]

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

Modified Files:
	intern.h script_c64.cpp 
Log Message:

A few opcode corrections for C64 maniac


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.527
retrieving revision 2.528
diff -u -d -r2.527 -r2.528
--- intern.h	24 Sep 2005 10:15:17 -0000	2.527
+++ intern.h	24 Sep 2005 14:28:00 -0000	2.528
@@ -446,11 +446,10 @@
 	void o_nop();
 	void o_getActorBitVar();
 	void o_setActorBitVar();
-	void o_unknown1();
+	void o_doSentence();
 	void o_unknown2();
 	void o_unknown3();
 	void o_getClosestObjActor();
-	void o_askForDisk();
 	void o_printEgo_c64();
 	void o_print_c64();
 	void o_unlockRoom();

Index: script_c64.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_c64.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- script_c64.cpp	24 Sep 2005 05:26:12 -0000	2.23
+++ script_c64.cpp	24 Sep 2005 14:28:00 -0000	2.24
@@ -38,8 +38,8 @@
 		/* 00 */
 		OPCODE(o5_stopObjectCode),
 		OPCODE(o2_putActor),
-		OPCODE(o_askForDisk),
-		OPCODE(o_unknown1),
+		OPCODE(o5_startMusic),
+		OPCODE(o_doSentence),
 		/* 04 */
 		OPCODE(o_isGreaterEqual),
 		OPCODE(o_stopCurrentScript),
@@ -119,7 +119,7 @@
 		OPCODE(o2_cutscene),
 		OPCODE(o2_putActor),
 		OPCODE(o2_startScript),
-		OPCODE(o_unknown1),
+		OPCODE(o_doSentence),
 		/* 44 */
 		OPCODE(o_isLess),
 		OPCODE(o_stopCurrentScript),
@@ -199,7 +199,7 @@
 		OPCODE(o_stopCurrentScript),
 		OPCODE(o2_putActor),
 		OPCODE(o_stopCurrentScript),
-		OPCODE(o_unknown1),
+		OPCODE(o_doSentence),
 		/* 84 */
 		OPCODE(o_isGreaterEqual),
 		OPCODE(o_stopCurrentScript),
@@ -279,7 +279,7 @@
 		OPCODE(o2_endCutscene),
 		OPCODE(o2_putActor),
 		OPCODE(o2_startScript),
-		OPCODE(o_unknown1),
+		OPCODE(o_doSentence),
 		/* C4 */
 		OPCODE(o_isLess),
 		OPCODE(o_stopCurrentScript),
@@ -662,11 +662,11 @@
 	decodeParseString();
 }
 
-void ScummEngine_c64::o_unknown1() {
+void ScummEngine_c64::o_doSentence() {
 	byte var1 = fetchScriptByte();
 	byte var2 = fetchScriptByte();
 	byte var3 = fetchScriptByte();
-	warning("STUB: o_unknown1(%d, %d, %d)", var1, var2, var3);
+	warning("STUB: o_doSentence(%d, %d, %d)", var1, var2, var3);
 }
 
 void ScummEngine_c64::o_unknown2() {
@@ -706,11 +706,6 @@
 	setResult(closest_obj);
 }
 
-void ScummEngine_c64::o_askForDisk() {
-	int disk = getVarOrDirectByte(PARAM_1);
-	debug(0, "o_askForDisk (%d)", disk);
-}
-
 void ScummEngine_c64::o_beginOverride() {
 	const int idx = vm.cutSceneStackPointer;
 	assert(0 <= idx && idx < 5);