From 17647335908317c855fb2b084d48428d928e6da8 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 22 Oct 2006 09:53:56 +0000
Subject: Add more opcodes for Elivra 2 and WW

svn-id: r24431
---
 engines/agos/debug.h       | 16 ++++++++--------
 engines/agos/script_e2.cpp |  3 +++
 engines/agos/script_ww.cpp |  3 +++
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'engines/agos')

diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index d98d507afd..d070e5515d 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -55,8 +55,8 @@ static const char *const elvira1_opcodeNameTable[300] = {
 	/* 20 */
 	"WWJ|IS_LEF",
 	"WWJ|IS_GEF",
-	"WWJ|IS_IN",
-	"WWJ|IS_NOT_IN",
+	"IIJ|IS_IN",
+	"IIJ|IS_NOT_IN",
 	/* 24 */
 	NULL,
 	NULL,
@@ -412,8 +412,8 @@ static const char *const elvira2_opcodeNameTable[256] = {
 	"VVJ|IS_LEF",
 	/* 20 */
 	"VVJ|IS_GEF",
-	NULL,
-	NULL,
+	"IIJ|IS_IN",
+	"IIJ|IS_NOT_IN",
 	"WJ|CHANCE",
 	/* 24 */
 	"IJ|IS_PLAYER",
@@ -434,7 +434,7 @@ static const char *const elvira2_opcodeNameTable[256] = {
 	"VV|MOVE",
 	"W|WHAT_O",
 	NULL,
-	NULL,
+	"IW|WEIGH",
 	/* 40 */
 	NULL,
 	"V|ZERO",
@@ -645,8 +645,8 @@ static const char *const waxworks_opcodeNameTable[256] = {
 	"VVJ|IS_LEF",
 	/* 20 */
 	"VVJ|IS_GEF",
-	NULL,
-	NULL,
+	"IIJ|IS_IN",
+	"IIJ|IS_NOT_IN",
 	"WJ|CHANCE",
 	/* 24 */
 	"IJ|IS_PLAYER",
@@ -667,7 +667,7 @@ static const char *const waxworks_opcodeNameTable[256] = {
 	"VV|MOVE",
 	"W|WHAT_O",
 	NULL,
-	NULL,
+	"IW|WEIGH",
 	/* 40 */
 	NULL,
 	"V|ZERO",
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index abaff14f88..976afb8de8 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -33,11 +33,14 @@ void AGOSEngine::setupElvira2Opcodes(OpcodeProc *op) {
 	op[8] = &AGOSEngine::oe1_isNotAt;
 	op[9] = &AGOSEngine::oe1_sibling;
 	op[10] = &AGOSEngine::oe1_notSibling;
+	op[21] = &AGOSEngine::oe1_isIn;
+	op[22] = &AGOSEngine::oe1_isNotIn;
 	op[24] = &AGOSEngine::oe1_isPlayer;
 	op[29] = &AGOSEngine::oe1_canPut;
 	op[34] = &AGOSEngine::oe1_copyof;
 	op[35] = &AGOSEngine::oe1_copyfo;
 	op[37] = &AGOSEngine::oe1_whatO;
+	op[39] = &AGOSEngine::oe1_weigh;
 	op[54] = &AGOSEngine::oe2_moveDirn;
 	op[73] = &AGOSEngine::oe1_pObj;
 	op[74] = &AGOSEngine::oe1_pName;
diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp
index 5297cb4e3c..6532a11b01 100644
--- a/engines/agos/script_ww.cpp
+++ b/engines/agos/script_ww.cpp
@@ -35,11 +35,14 @@ void AGOSEngine::setupWaxworksOpcodes(OpcodeProc *op) {
 	op[8] = &AGOSEngine::oe1_isNotAt;
 	op[9] = &AGOSEngine::oe1_sibling;
 	op[10] = &AGOSEngine::oe1_notSibling;
+	op[21] = &AGOSEngine::oe1_isIn;
+	op[22] = &AGOSEngine::oe1_isNotIn;
 	op[24] = &AGOSEngine::oe1_isPlayer;
 	op[29] = &AGOSEngine::oe1_canPut;
 	op[34] = &AGOSEngine::oe1_copyof;
 	op[37] = &AGOSEngine::oe1_whatO;
 	op[35] = &AGOSEngine::oe1_copyfo;
+	op[39] = &AGOSEngine::oe1_weigh;
 	op[54] = &AGOSEngine::oww_moveDirn;
 	op[55] = &AGOSEngine::oww_goto;
 	op[65] = &AGOSEngine::o_addTextBox;
-- 
cgit v1.2.3