diff options
| author | Martin Kiewitz | 2010-06-30 14:39:03 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-30 14:39:03 +0000 |
| commit | 04d8ac41142de7f1a3a732073d1e236c0192f533 (patch) | |
| tree | ed44bcaa6265f8462761cad559b80d6b1229ce74 | |
| parent | 4e999c8295adeade2317d9c486b943d3fd290c2c (diff) | |
| download | scummvm-rg350-04d8ac41142de7f1a3a732073d1e236c0192f533.tar.gz scummvm-rg350-04d8ac41142de7f1a3a732073d1e236c0192f533.tar.bz2 scummvm-rg350-04d8ac41142de7f1a3a732073d1e236c0192f533.zip | |
SCI: removing sq1 workaround for kUnLoad for now, maybe it was originally meant for calling kUnLoad with just 1 argument
svn-id: r50534
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index ec3cdc5106..b0c369605e 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -207,12 +207,6 @@ static const char *s_defaultKernelNames[] = { // .* -> any parameters afterwards (or none) // gameID, scriptNr,lvl, object-name, method-name, call,index,replace -static const SciWorkaroundEntry kUnLoad_workarounds[] = { - { GID_SQ1, 998, 0, "View", "delete", -1, 0, { 1, 0 } }, // exiting ulence flats bar - slotGuyBody::dispose calls view::delete resulting in parameter 1 to be a reference - SCI_WORKAROUNDENTRY_TERMINATOR -}; - -// gameID, scriptNr,lvl, object-name, method-name, call,index,replace static const SciWorkaroundEntry kDisposeScript_workarounds[] = { { GID_QFG1, 64, 0, "rm64", "dispose", -1, 0, { 1, 0 } }, // parameter 0 is an object when leaving graveyard SCI_WORKAROUNDENTRY_TERMINATOR @@ -252,7 +246,8 @@ struct SciKernelMapEntry { // name, version/platform, signature, sub-signatures, workarounds static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(Load), SIG_EVERYWHERE, "iii*", NULL, NULL }, - { MAP_CALL(UnLoad), SIG_EVERYWHERE, "iRi*", NULL, kUnLoad_workarounds }, + { MAP_CALL(UnLoad), SIG_EVERYWHERE, "iRi*", NULL, NULL }, + // ^^ - in SQ1 when leaving ulence flats bar, kUnLoad is called with just one argument (FIXME?) { MAP_CALL(ScriptID), SIG_EVERYWHERE, "Ioi*", NULL, NULL }, { MAP_CALL(DisposeScript), SIG_EVERYWHERE, "ii*", NULL, kDisposeScript_workarounds }, { MAP_CALL(Clone), SIG_EVERYWHERE, "o", NULL, NULL }, |