From d8035140e2a0d4210cd77e4b24fe3430aacc6ea2 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Fri, 18 Mar 2016 23:50:24 +0100
Subject: ADL: Clean up opcodes

---
 engines/adl/adl_v2.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/adl/adl_v2.cpp')

diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp
index 1e5553a22a..4ef2ae27df 100644
--- a/engines/adl/adl_v2.cpp
+++ b/engines/adl/adl_v2.cpp
@@ -52,12 +52,12 @@ void AdlEngine_v2::setupOpcodeTables() {
 	// 0x04
 	Opcode(o2_isNounNotInRoom);
 	Opcode(o1_isMovesGT);
-	Opcode(o1_isVarEq);
+	Opcode(o1_isVarEQ);
 	OpcodeUnImpl();
 	// 0x08
 	OpcodeUnImpl();
-	Opcode(o1_isCurPicEq);
-	Opcode(o1_isItemPicEq);
+	Opcode(o1_isCurPicEQ);
+	Opcode(o1_isItemPicEQ);
 
 	SetOpcodeTable(_actOpcodes);
 	// 0x00
@@ -114,10 +114,10 @@ int AdlEngine_v2::o2_isFirstTime(ScriptEnv &e) {
 int AdlEngine_v2::o2_isRandomGT(ScriptEnv &e) {
 	byte rnd = _random->getRandomNumber(255);
 
-	if (e.arg(1) >= rnd)
-		return -1;
+	if (rnd > e.arg(1))
+		return 1;
 
-	return 1;
+	return -1;
 }
 
 int AdlEngine_v2::o2_isItemInRoom(ScriptEnv &e) {
@@ -126,10 +126,10 @@ int AdlEngine_v2::o2_isItemInRoom(ScriptEnv &e) {
 	if (room == IDI_CUR_ROOM)
 		room = _state.room;
 
-	if (getItem(e.arg(1)).room != room)
-		return -1;
+	if (getItem(e.arg(1)).room == room)
+		return 2;
 
-	return 2;
+	return -1;
 }
 
 int AdlEngine_v2::o2_isNounNotInRoom(ScriptEnv &e) {
-- 
cgit v1.2.3