[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.63,2.64 script_v2.cpp,2.23,2.24

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27392

Modified Files:
	intern.h script_v2.cpp 
Log Message:
small fix for v2 opcodes

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.63
retrieving revision 2.64
diff -u -d -r2.63 -r2.64
--- intern.h	26 Apr 2003 20:03:38 -0000	2.63
+++ intern.h	27 Apr 2003 07:13:02 -0000	2.64
@@ -305,7 +305,7 @@
 	void o2_stopSound();
 	void o2_endCutscene();
 	void o2_decrement();
-	void o2_divide();
+	void o2_drawSentence();
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- script_v2.cpp	26 Apr 2003 20:03:38 -0000	2.23
+++ script_v2.cpp	27 Apr 2003 07:13:03 -0000	2.24
@@ -248,7 +248,7 @@
 		OPCODE(o2_addDirect),
 		OPCODE(o5_dummy),
 		/* AC */
-		OPCODE(o2_delay),
+		OPCODE(o2_drawSentence),
 		OPCODE(o2_putActorInRoom),
 		OPCODE(o2_waitForSentence),
 		OPCODE(o2_ifNotState04),
@@ -306,7 +306,7 @@
 		OPCODE(o2_printEgo),
 		OPCODE(o2_doSentence),
 		OPCODE(o2_add),
-		OPCODE(o2_divide),
+		OPCODE(o2_setBitVar),
 		/* DC */
 		OPCODE(o5_dummy),
 		OPCODE(o2_ifClassOfIs),
@@ -1480,13 +1480,6 @@
 	_sound->stopSound(getVarOrDirectByte(0x80));
 }
 
-void Scumm_v2::o2_divide() {
-	int a;
-	getResultPos();
-	a = getVarOrDirectWord(0x80);
-	if (a == 0) {
-		error("Divide by zero");
-		_vars[_resultVarNumber] = 0;
-	} else
-		_vars[_resultVarNumber] /= a;
+void Scumm_v2::o2_drawSentence() {
+	error("TODO o2_drawSentence()");
 }