[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.44,1.45 scumm.h,1.51,1.52

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv3100/scumm

Modified Files:
	script_v2.cpp scumm.h 
Log Message:
Correct that FT opcode - it's bitwise or, not logical


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- script_v2.cpp	2 Nov 2002 07:53:46 -0000	1.44
+++ script_v2.cpp	2 Nov 2002 08:18:21 -0000	1.45
@@ -302,8 +302,8 @@
 		/* D4 */
 		&Scumm::o6_invalid,
 		&Scumm::o6_jumpToScript,
-		&Scumm::o6_land,
-		&Scumm::o6_lor,
+		&Scumm::o6_band,
+		&Scumm::o6_bor,
 		/* D8 */
 		&Scumm::o6_isRoomScriptRunning,
 		&Scumm::o6_invalid,
@@ -625,8 +625,8 @@
 		/* D4 */
 		"o6_invalid",
 		"o6_jumpToScript",
-		"o6_land",
-		"o6_lor",
+		"o6_band",
+		"o6_bor",
 		/* D8 */
 		"o6_isRoomScriptRunning",
 		"o6_invalid",
@@ -889,16 +889,28 @@
 	push(pop() / a);
 }
 
-void Scumm::o6_land()
+void Scumm::o6_land()	// Logical And
 {
 	int a = pop();
 	push(pop() && a);
 }
 
-void Scumm::o6_lor()
+void Scumm::o6_lor()	// Logical Or
 {
 	int a = pop();
 	push(pop() || a);
+}
+
+void Scumm::o6_bor()	// Bitwise Or
+{
+	int a = pop();
+	push(pop() | a);
+}
+
+void Scumm::o6_band()	// Bitwise And
+{
+	int a = pop();
+	push(pop() | a);
 }
 
 void Scumm::o6_kill()

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- scumm.h	28 Oct 2002 09:03:02 -0000	1.51
+++ scumm.h	2 Nov 2002 08:18:21 -0000	1.52
@@ -541,6 +541,7 @@
 	void runAllScripts();
 	void setupOpcodes();
 	void setupOpcodes2();	
+	//void setupOpcodes3();	
 	void cutscene(int16 *args);
 	void endCutscene();
 	void exitCutscene();
@@ -1224,6 +1225,9 @@
 	void o6_drawBlastObject();
 	void o6_getActorPriority();
 	void o6_unknownCD();
+	void o6_bor();
+	void o6_band();
+	// void o7_userfaceOps();
 
 	/* Scumm Vars */
 	byte VAR_EGO;