diff options
| author | Filippos Karapetis | 2010-11-08 00:41:39 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-11-08 00:41:39 +0000 |
| commit | 05eb352e5c4c9dd359640954100038d195713bce (patch) | |
| tree | 5d810f0e65bd0e18e58c3430b9e3e3cdf45a2518 | |
| parent | 5de2668939a6735da2b3438b7c586fc185791ef8 (diff) | |
| download | scummvm-rg350-05eb352e5c4c9dd359640954100038d195713bce.tar.gz scummvm-rg350-05eb352e5c4c9dd359640954100038d195713bce.tar.bz2 scummvm-rg350-05eb352e5c4c9dd359640954100038d195713bce.zip | |
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"
svn-id: r54134
| -rw-r--r-- | engines/sci/engine/workarounds.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index 23a6b24fd4..b4bcdaa0ca 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -480,8 +480,9 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun && ((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; |