diff options
| author | Max Horn | 2011-06-03 14:03:36 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-03 16:16:38 +0200 |
| commit | 11bd6da595247773155b6155beb795ea25456fa7 (patch) | |
| tree | b43784694dcdd7103c7472b7b6259c9341250685 /engines/sci/engine/workarounds.cpp | |
| parent | b25fa194b32f4a9862f52c1b3b90aeabd43de544 (diff) | |
| download | scummvm-rg350-11bd6da595247773155b6155beb795ea25456fa7.tar.gz scummvm-rg350-11bd6da595247773155b6155beb795ea25456fa7.tar.bz2 scummvm-rg350-11bd6da595247773155b6155beb795ea25456fa7.zip | |
SCI: Switch some char* to Common::String&
Diffstat (limited to 'engines/sci/engine/workarounds.cpp')
| -rw-r--r-- | engines/sci/engine/workarounds.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index fa25b02a8f..8bf90ff53d 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -447,7 +447,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun workaround = workaroundList; while (workaround->methodName) { bool objectNameMatches = (workaround->objectName == NULL) || - (workaround->objectName == g_sci->getSciLanguageString(searchObjectName.c_str(), K_LANG_ENGLISH)); + (workaround->objectName == g_sci->getSciLanguageString(searchObjectName, K_LANG_ENGLISH)); // Special case: in the fanmade Russian translation of SQ4, all // of the object names have been deleted or renamed to Russian, @@ -460,7 +460,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun && ((workaround->roomNr == -1) || (workaround->roomNr == curRoomNumber)) && ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel)) && objectNameMatches - && workaround->methodName == g_sci->getSciLanguageString(curMethodName.c_str(), K_LANG_ENGLISH) + && workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH) && workaround->localCallOffset == lastCall->debugLocalCallOffset && ((workaround->index == -1) || (workaround->index == index))) { // Workaround found |