[Scummvm-cvs-logs] SF.net SVN: scummvm:[54134] scummvm/trunk/engines/sci/engine/workarounds. cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Nov 8 01:41:40 CET 2010
Revision: 54134
http://scummvm.svn.sourceforge.net/scummvm/?rev=54134&view=rev
Author: thebluegr
Date: 2010-11-08 00:41:39 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
SCI: Bugfix for script workarounds
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/trunk/engines/sci/engine/workarounds.cpp
Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp 2010-11-08 00:18:34 UTC (rev 54133)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp 2010-11-08 00:41:39 UTC (rev 54134)
@@ -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.
More information about the Scummvm-git-logs
mailing list