[Scummvm-cvs-logs] scummvm master -> 09014d5b96b625f7691bbda3ded24dfa386863d5

[m-kiewitz]

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:
09014d5b96 SCI: fix bug in new workaround sig code


Commit: 09014d5b96b625f7691bbda3ded24dfa386863d5
    https://github.com/scummvm/scummvm/commit/09014d5b96b625f7691bbda3ded24dfa386863d5
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-04-21T14:42:55+02:00

Commit Message:
SCI: fix bug in new workaround sig code

Changed paths:
    engines/sci/engine/workarounds.cpp



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index b334576..c5d85b8 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -804,9 +804,9 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						&& workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH)
 						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
-					if ((workaround->localCallSignature) || (curLocalCallOffset != -1)) {
+					if ((workaround->localCallSignature) || (curLocalCallOffset >= 0)) {
 						// local call signature found and/or subcall was made
-						if ((workaround->localCallSignature) && (lastCall->debugLocalCallOffset)) {
+						if ((workaround->localCallSignature) && (curLocalCallOffset >= 0)) {
 							// local call signature found and subcall was made -> check signature accordingly
 							if (!curScriptPtr) {
 								// get script data