[Scummvm-cvs-logs] scummvm master -> 6b017c2d83880d2c1712bc5d44a3691a62d95e84

m-kiewitz m_kiewitz at users.sourceforge.net
Sun Jun 14 22:44:44 CEST 2015


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:
6b017c2d83 SHERLOCK: remove inline from Talk::isOpcode()


Commit: 6b017c2d83880d2c1712bc5d44a3691a62d95e84
    https://github.com/scummvm/scummvm/commit/6b017c2d83880d2c1712bc5d44a3691a62d95e84
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-14T22:43:52+02:00

Commit Message:
SHERLOCK: remove inline from Talk::isOpcode()

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



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 6b122b4..9983a30 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1200,7 +1200,7 @@ int Talk::waitForMore(int delay) {
 	return key2;
 }
 
-inline bool Talk::isOpcode(byte checkCharacter) {
+bool Talk::isOpcode(byte checkCharacter) {
 	if ((checkCharacter < _opcodes[0]) || (checkCharacter >= (_opcodes[0] + 99)))
 		return false; // outside of range
 	if (_opcodeTable[checkCharacter - _opcodes[0]])
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 3a85c5d..ae95cf9 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -258,7 +258,7 @@ protected:
 	/**
 	 * Checks, if a character is an opcode
 	 */
-	virtual inline bool isOpcode(byte checkCharacter);
+	virtual bool isOpcode(byte checkCharacter);
 
 	/**
 	 * Display the talk interface window






More information about the Scummvm-git-logs mailing list