[Scummvm-cvs-logs] scummvm master -> 12227fb6f8f69407d8b513ab692fa590f1caa180

[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:
12227fb6f8 SHERLOCK: SS: Remove now redundant isPossibleOpcode method


Commit: 12227fb6f8f69407d8b513ab692fa590f1caa180
    https://github.com/scummvm/scummvm/commit/12227fb6f8f69407d8b513ab692fa590f1caa180
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-05T21:46:30-04:00

Commit Message:
SHERLOCK: SS: Remove now redundant isPossibleOpcode method

Changed paths:
    engines/sherlock/talk.cpp
    engines/sherlock/talk.h



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 60e7dc4..af80dae 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 a0845ef..2c0da24 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