From 574af78acb793b23b22f3a47d201d4074387304e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 12 May 2008 12:42:10 +0000
Subject: - Moved some opcodes to KyraEngine_v1 - Little variable renaming

svn-id: r32053
---
 engines/kyra/script_mr.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'engines/kyra/script_mr.cpp')

diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index 0142a06b7d..af0bde24c1 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -1199,19 +1199,19 @@ void KyraEngine_MR::setupOpcodeTable() {
 	Opcode(o3_removeInventoryItemInstances);
 	Opcode(o3_countInventoryItemInstances);
 	Opcode(o3_npcChatSequence);
-	Opcode(o2_queryGameFlag);
+	Opcode(o1_queryGameFlag);
 	// 0x28
-	Opcode(o2_resetGameFlag);
-	Opcode(o2_setGameFlag);
-	Opcode(o2_setHandItem);
-	Opcode(o2_removeHandItem);
+	Opcode(o1_resetGameFlag);
+	Opcode(o1_setGameFlag);
+	Opcode(o1_setHandItem);
+	Opcode(o1_removeHandItem);
 	// 0x2c
-	Opcode(o2_handItemSet);
-	Opcode(o2_hideMouse);
+	Opcode(o1_getMouseState);
+	Opcode(o1_hideMouse);
 	Opcode(o2_addSpecialExit);
-	Opcode(o2_setMousePos);
+	Opcode(o1_setMousePos);
 	// 0x30
-	Opcode(o2_showMouse);
+	Opcode(o1_showMouse);
 	Opcode(o3_badConscienceChat);
 	Opcode(o3_wipeDownMouseItem);
 	Opcode(o3_dummy);
@@ -1271,7 +1271,7 @@ void KyraEngine_MR::setupOpcodeTable() {
 	Opcode(o3_showSceneStringsMessage);
 	OpcodeUnImpl();
 	// 0x60
-	Opcode(o2_getRand);
+	Opcode(o1_getRand);
 	Opcode(o3_dummy);
 	Opcode(o2_setDeathHandler);
 	Opcode(o3_showGoodConscience);
@@ -1379,7 +1379,7 @@ void KyraEngine_MR::setupOpcodeTable() {
 	Opcode(o3_dummy);
 	// 0x0a
 	Opcode(o2a_setResetFrame);
-	Opcode(o2_getRand);
+	Opcode(o1_getRand);
 	Opcode(o3_getMalcolmShapes);
 	Opcode(o3_dummy);
 
@@ -1387,8 +1387,8 @@ void KyraEngine_MR::setupOpcodeTable() {
 	// 0x00
 	Opcode(o3d_updateAnim);
 	Opcode(o3d_delay);
-	Opcode(o2_getRand);
-	Opcode(o2_queryGameFlag);
+	Opcode(o1_getRand);
+	Opcode(o1_queryGameFlag);
 	// 0x04
 	Opcode(o3_dummy);
 }
-- 
cgit v1.2.3