libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 00:35:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Further changes for different opcode ranges

Browse Source
This commit is contained in:
Paul Gilbert 2015-06-13 20:06:31 -04:00
parent c5490b8ecc
commit 92f54db76c
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sherlock/talk.cpp
View File

@ -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:

5
engines/sherlock/tattoo/tattoo_talk.cpp
View File

@ -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,