[Scummvm-cvs-logs] scummvm master -> 9ce6dc72d35ba1339a37f8700e2608bc7440b900

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9ce6dc72d3 SHERLOCK: Add missing OP_END_TEXT_WINDOW opcode


Commit: 9ce6dc72d35ba1339a37f8700e2608bc7440b900
    https://github.com/scummvm/scummvm/commit/9ce6dc72d35ba1339a37f8700e2608bc7440b900
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-07T16:59:56-04:00

Commit Message:
SHERLOCK: Add missing OP_END_TEXT_WINDOW opcode

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp
    engines/sherlock/talk.h
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 0ad162e..217ed9b 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -98,7 +98,8 @@ const byte SCALPEL_OPCODES[] = {
 	0,		// OP_RESTORE_PEOPLE_SEQUENCE
 	0,		// OP_NPC_VERB_TARGET
 	0,		// OP_TURN_SOUNDS_OFF
-	0		// OP_NULL
+	0,		// OP_NULL
+	0		// OP_END_TEXT_WINDOW
 };
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 190224b..c6fda0b 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -106,7 +106,8 @@ enum {
 	OP_RESTORE_PEOPLE_SEQUENCE	= 64,
 	OP_NPC_VERB_TARGET			= 65,
 	OP_TURN_SOUNDS_OFF			= 66,
-	OP_NULL						= 67
+	OP_NULL						= 67,
+	OP_END_TEXT_WINDOW			= 68
 };
 
 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
index 78cc593..91c6f25 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -103,7 +103,8 @@ const byte TATTOO_OPCODES[] = {
 	224,	// OP_RESTORE_PEOPLE_SEQUENCE
 	226,	// OP_NPC_VERB_TARGET
 	227,	// OP_TURN_SOUNDS_OFF
-	225		// OP_NULL
+	225,	// OP_NULL
+	203		// OP_END_TEXT_WINDOW
 };
 
 /*----------------------------------------------------------------*/