SHERLOCK: Fix mistakes in opcode lists

scummvm · Jun 7, 2015 · a066d27 · a066d27
1 parent 359d4cd
commit a066d27
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -149,7 +149,7 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 	};
 
 	_opcodes = SCALPEL_OPCODES;

diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
@@ -84,28 +84,29 @@ enum {
 	OP_NEED_PASSWORD			= 42,
 	OP_SET_SCENE_ENTRY_FLAG		= 43,
 	OP_WALK_NPC_TO_CANIM		= 44,
-	OP_WALK_HOLMES_AND_NPC_TO_COORDS = 45,
-	OP_SET_NPC_TALK_FILE		= 46,
-	OP_TURN_NPC_OFF				= 47,
-	OP_TURN_NPC_ON				= 48,
-	OP_NPC_DESC_ON_OFF			= 49,
-	OP_NPC_PATH_PAUSE_TAKING_NOTES	= 50,
-	OP_NPC_PATH_PAUSE_LOOKING_HOLMES = 51,
-	OP_ENABLE_TALK_INTERRUPTS	= 52,
-	OP_DISABLE_TALK_INTERRUPTS	= 53,
-	OP_SET_NPC_INFO_LINE		= 54,
-	OP_SET_NPC_POSITION			= 54,
-	OP_NPC_PATH_LABEL			= 55,
-	OP_PATH_GOTO_LABEL			= 56,
-	OP_PATH_IF_FLAG_GOTO_LABEL	= 57,
-	OP_NPC_WALK_GRAPHICS		= 58,
-	OP_NPC_VERB					= 59,
-	OP_NPC_VERB_CANIM			= 60,
-	OP_NPC_VERB_SCRIPT			= 61,
-	OP_RESTORE_PEOPLE_SEQUENCE	= 62,
-	OP_NPC_VERB_TARGET			= 63,
-	OP_TURN_SOUNDS_OFF			= 64,
-	OP_NULL						= 65
+	OP_WALK_NPC_TO_COORDS		= 45,
+	OP_WALK_HOLMES_AND_NPC_TO_COORDS = 46,
+	OP_SET_NPC_TALK_FILE		= 47,
+	OP_TURN_NPC_OFF				= 48,
+	OP_TURN_NPC_ON				= 49,
+	OP_NPC_DESC_ON_OFF			= 50,
+	OP_NPC_PATH_PAUSE_TAKING_NOTES	= 51,
+	OP_NPC_PATH_PAUSE_LOOKING_HOLMES = 52,
+	OP_ENABLE_TALK_INTERRUPTS	= 53,
+	OP_DISABLE_TALK_INTERRUPTS	= 54,
+	OP_SET_NPC_INFO_LINE		= 55,
+	OP_SET_NPC_POSITION			= 56,
+	OP_NPC_PATH_LABEL			= 57,
+	OP_PATH_GOTO_LABEL			= 58,
+	OP_PATH_IF_FLAG_GOTO_LABEL	= 59,
+	OP_NPC_WALK_GRAPHICS		= 60,
+	OP_NPC_VERB					= 61,
+	OP_NPC_VERB_CANIM			= 62,
+	OP_NPC_VERB_SCRIPT			= 63,
+	OP_RESTORE_PEOPLE_SEQUENCE	= 64,
+	OP_NPC_VERB_TARGET			= 65,
+	OP_TURN_SOUNDS_OFF			= 66,
+	OP_NULL						= 67
 };
 
 enum OpcodeReturn { RET_EXIT = -1, RET_SUCCESS = 0, RET_CONTINUE = 1 };

diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -81,6 +81,7 @@ const byte TATTOO_OPCODES[] = {
 	197,	// OP_PASSWORD
 	198,	// OP_SET_SCENE_ENTRY_FLAG
 	185,	// OP_WALK_NPC_TO_CANIM
+	186,	// OP_WALK_NPC_TO_COORDS
 	204,	// OP_WALK_HOLMES_AND_NPC_TO_COORDS
 	205,	// OP_SET_NPC_TALK_FILE
 	206,	// OP_TURN_NPC_OFF