diff options
| author | Paul Gilbert | 2015-06-13 20:06:31 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-13 20:06:31 -0400 |
| commit | 92f54db76c297925de5369e9fd16cb2173f4fc49 (patch) | |
| tree | c2f7656bd303d9b841c4fc98a452e5a3d0d42058 /engines | |
| parent | c5490b8ecc41eede03e5a27bc613bf262a83288d (diff) | |
| download | scummvm-rg350-92f54db76c297925de5369e9fd16cb2173f4fc49.tar.gz scummvm-rg350-92f54db76c297925de5369e9fd16cb2173f4fc49.tar.bz2 scummvm-rg350-92f54db76c297925de5369e9fd16cb2173f4fc49.zip | |
SHERLOCK: Further changes for different opcode ranges
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/talk.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index b3363ab566..c298b87ac7 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 84ee63daaf..9f6d68945f 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, |