diff options
| author | Paul Gilbert | 2015-10-05 21:46:30 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-05 21:46:30 -0400 |
| commit | 12227fb6f8f69407d8b513ab692fa590f1caa180 (patch) | |
| tree | f6fee12c97865139db384d44ce90e471b20f698b /engines/sherlock | |
| parent | f70159b9a2407e61a53c6f441fff8fb307575992 (diff) | |
| download | scummvm-rg350-12227fb6f8f69407d8b513ab692fa590f1caa180.tar.gz scummvm-rg350-12227fb6f8f69407d8b513ab692fa590f1caa180.tar.bz2 scummvm-rg350-12227fb6f8f69407d8b513ab692fa590f1caa180.zip | |
SHERLOCK: SS: Remove now redundant isPossibleOpcode method
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/talk.cpp | 10 | ||||
| -rw-r--r-- | engines/sherlock/talk.h | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 60e7dc43b9..af80dae519 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -766,7 +766,6 @@ void Talk::doScript(const Common::String &script) { // in case more invalid characters exist. // More information see bug #6931 // - //} else if (isPossibleOpcode(c)) { // Handle control code switch ((this->*_opcodeTable[c - _opcodes[0]])(str)) { @@ -929,15 +928,6 @@ bool Talk::isOpcode(byte checkCharacter) { return false; } -bool Talk::isPossibleOpcode(byte checkCharacter) { - // Some conversations in the Spanish version, such as the first conversation with Lastrade, - // start with an invalid character. Hence isPossibleOpcode being separate from isOpcode - if (IS_SERRATED_SCALPEL && _vm->getLanguage() == Common::ES_ESP) - return checkCharacter >= 128; - - return isOpcode(checkCharacter); -} - void Talk::popStack() { if (!_scriptStack.empty()) { ScriptStackEntry scriptEntry = _scriptStack.pop(); diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h index a0845efb2c..2c0da24d69 100644 --- a/engines/sherlock/talk.h +++ b/engines/sherlock/talk.h @@ -218,11 +218,6 @@ protected: * Checks if a character is an opcode */ bool isOpcode(byte checkCharacter); - - /** - * Checks if a character might be an opcode - */ - bool isPossibleOpcode(byte checkCharacter); /** * Form a table of the display indexes for statements |