[Scummvm-cvs-logs] SF.net SVN: scummvm:[51079] tools/branches/gsoc2010-decompiler/decompiler/ scummv6/disassembler.cpp

[pidgeot at users.sourceforge.net]

Revision: 51079
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51079&view=rev
Author:   pidgeot
Date:     2010-07-21 00:48:07 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
Fix operators for logical/bitwise and/or

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp

Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp	2010-07-21 00:14:53 UTC (rev 51078)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp	2010-07-21 00:48:07 UTC (rev 51079)
@@ -76,8 +76,8 @@
 		OPCODE_OP(0x15, "sub", kBinaryOp, -1, "", "-");
 		OPCODE_OP(0x16, "mul", kBinaryOp, -1, "", "*");
 		OPCODE_OP(0x17, "div", kBinaryOp, -1, "", "/");
-		OPCODE_OP(0x18, "land", kBinaryOp, -1, "", "&");
-		OPCODE_OP(0x19, "lor", kBinaryOp, -1, "", "|");
+		OPCODE_OP(0x18, "land", kBinaryOp, -1, "", "&&");
+		OPCODE_OP(0x19, "lor", kBinaryOp, -1, "", "||");
 		OPCODE(0x1A, "pop", kStack, -1, "");
 		OPCODE(0x42, "writeByteVar", kStore, -1, "B");
 		OPCODE(0x43, "writeWordVar", kStore, -1, "w");
@@ -410,8 +410,8 @@
 		OPCODE(0xD2, "getAnimateVariable", kSpecial, -1, "");
 		OPCODE(0xD4, "shuffle", kSpecial, -2, "w");
 		OPCODE(0xD5, "jumpToScript", kSpecial, 0x1020, ""); // Variable stack arguments
-		OPCODE_OP(0xD6, "band", kBinaryOp, -1, "", "&&");
-		OPCODE_OP(0xD7, "bor", kBinaryOp, -1, "", "||");
+		OPCODE_OP(0xD6, "band", kBinaryOp, -1, "", "&");
+		OPCODE_OP(0xD7, "bor", kBinaryOp, -1, "", "|");
 		OPCODE(0xD8, "isRoomScriptRunning", kSpecial, 0, "");
 		OPCODE(0xDD, "findAllObjects", kSpecial, 0, "");
 		OPCODE(0xE1, "getPixel", kSpecial, -1, "");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.