diff options
| author | Martin Kiewitz | 2010-07-22 21:06:45 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-22 21:06:45 +0000 |
| commit | 665ae8de9d04caa56646d00193b685008125fb1c (patch) | |
| tree | f4bc937431de2537ea36f300c249257bde09083a /engines/sci/engine | |
| parent | 9dcbff72596094e44bea0b59701830b59e92fad9 (diff) | |
| download | scummvm-rg350-665ae8de9d04caa56646d00193b685008125fb1c.tar.gz scummvm-rg350-665ae8de9d04caa56646d00193b685008125fb1c.tar.bz2 scummvm-rg350-665ae8de9d04caa56646d00193b685008125fb1c.zip | |
SCI: fix signature of kStrCpy
disabled workaround for island of dr. brain, seems to work w/o and was probably caused by bad signature
svn-id: r51165
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/workarounds.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index a73a7ef9cd..8a7de85cbe 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -430,7 +430,7 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(StrAt), SIG_EVERYWHERE, "ri(i)", NULL, NULL }, { MAP_CALL(StrCat), SIG_EVERYWHERE, "rr", NULL, NULL }, { MAP_CALL(StrCmp), SIG_EVERYWHERE, "rr(i)", NULL, NULL }, - { MAP_CALL(StrCpy), SIG_EVERYWHERE, "[r0]r(i)", NULL, kStrCpy_workarounds }, + { MAP_CALL(StrCpy), SIG_EVERYWHERE, "r[r0](i)", NULL, kStrCpy_workarounds }, { MAP_CALL(StrEnd), SIG_EVERYWHERE, "r", NULL, NULL }, { MAP_CALL(StrLen), SIG_EVERYWHERE, "[r0]", NULL, NULL }, { MAP_CALL(StrSplit), SIG_EVERYWHERE, "rr[r0]", NULL, NULL }, diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index f035baf4ed..6e92e43e5e 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -164,7 +164,8 @@ const SciWorkaroundEntry kUnLoad_workarounds[] = { // gameID, room,script,lvl, object-name, method-name, call,index, workaround const SciWorkaroundEntry kStrCpy_workarounds[] = { - { GID_ISLANDBRAIN, 260, 45, 0, "aWord", "addOn", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // Hominy Homonym puzzle + // seems not to be needed, because the signature was wrong + //{ GID_ISLANDBRAIN, 260, 45, 0, "aWord", "addOn", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // Hominy Homonym puzzle SCI_WORKAROUNDENTRY_TERMINATOR }; |