[Scummvm-cvs-logs] SF.net SVN: scummvm:[54135] scummvm/branches/branch-1-2-0/engines/sci/ engine/workarounds.cpp

[thebluegr at users.sourceforge.net]

Revision: 54135
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54135&view=rev
Author:   thebluegr
Date:     2010-11-08 00:45:47 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
SCI: Bugfix for script workarounds (backport)

Get the English versions of objects and methods when checking for script
workarounds, as the objects/methods could be translated. Fixes bug #3104623,
"PQ3: Crash when click on City map"

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/sci/engine/workarounds.cpp

Modified: scummvm/branches/branch-1-2-0/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/sci/engine/workarounds.cpp	2010-11-08 00:41:39 UTC (rev 54134)
+++ scummvm/branches/branch-1-2-0/engines/sci/engine/workarounds.cpp	2010-11-08 00:45:47 UTC (rev 54135)
@@ -480,8 +480,9 @@
 						&& ((workaround->scriptNr == -1) || (workaround->scriptNr == curScriptNr))
 						&& ((workaround->roomNr == -1) || (workaround->roomNr == curRoomNumber))
 						&& ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel))
-						&& ((workaround->objectName == NULL) || (workaround->objectName == searchObjectName))
-						&& workaround->methodName == curMethodName && workaround->localCallOffset == lastCall->debugLocalCallOffset
+						&& ((workaround->objectName == NULL) || (workaround->objectName == g_sci->getSciLanguageString(searchObjectName.c_str(), K_LANG_ENGLISH)))
+						&& workaround->methodName == g_sci->getSciLanguageString(curMethodName.c_str(), K_LANG_ENGLISH)
+						&& workaround->localCallOffset == lastCall->debugLocalCallOffset
 						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
 					return workaround->newValue;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.