[Scummvm-cvs-logs] scummvm master -> 92f54db76c297925de5369e9fd16cb2173f4fc49

[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:
92f54db76c SHERLOCK: Further changes for different opcode ranges


Commit: 92f54db76c297925de5369e9fd16cb2173f4fc49
    https://github.com/scummvm/scummvm/commit/92f54db76c297925de5369e9fd16cb2173f4fc49
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-13T20:06:31-04:00

Commit Message:
SHERLOCK: Further changes for different opcode ranges

Changed paths:
    engines/sherlock/talk.cpp
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b3363ab..c298b87 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1049,9 +1049,9 @@ void Talk::doScript(const Common::String &script) {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (c >= 128 && c <= 227 && _opcodeTable[c - 128]) {
+		} else if (c >= _opcodes[0] && c < (_opcodes[0] + 99) && _opcodeTable[c - _opcodes[0]]) {
 			// Handle control code
-			switch ((this->*_opcodeTable[c - 128])(str)) {
+			switch ((this->*_opcodeTable[c - _opcodes[0]])(str)) {
 			case RET_EXIT:
 				return;
 			case RET_CONTINUE:
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 84ee63d..9f6d689 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -111,11 +111,6 @@ const byte TATTOO_OPCODES[] = {
 
 TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm) {
 	static OpcodeMethod OPCODE_METHODS[] = {
-		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,
 		(OpcodeMethod)&TattooTalk::cmdSwitchSpeaker,
 
 		(OpcodeMethod)&TattooTalk::cmdRunCAnimation,