aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-07-28 09:34:31 +0000
committerFilippos Karapetis2010-07-28 09:34:31 +0000
commiteb1cdc2c49ca17deac34563b9aad1e20cab18a27 (patch)
tree43071812b50d626dad64ee20808f421b8687234b
parentbae197c489346f7373a5f6b877456eaa1b2530d8 (diff)
downloadscummvm-rg350-eb1cdc2c49ca17deac34563b9aad1e20cab18a27.tar.gz
scummvm-rg350-eb1cdc2c49ca17deac34563b9aad1e20cab18a27.tar.bz2
scummvm-rg350-eb1cdc2c49ca17deac34563b9aad1e20cab18a27.zip
SCI: Some workaround fixes
- Merged all of the different workarounds for the rats in the KQ6 maze in one, thus fixing bug #3035824 - "kq6-win: more crashes on rats in catacombs" - Merged 4 different workarounds for LSL3 in one svn-id: r51410
-rw-r--r--engines/sci/engine/workarounds.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index c3a3751b0d..0f11f63bea 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -77,8 +77,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
{ GID_JONES, 764, 255, 0, "", "export 0", -1, 14, { WORKAROUND_FAKE, 0 } }, // jones/ega&vga only - called when the game starts
{ GID_KQ5, -1, 0, 0, "", "export 29", -1, 3, { WORKAROUND_FAKE, 0 } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #3034700
{ GID_KQ5, 25, 25, 0, "rm025", "doit", -1, 0, { WORKAROUND_FAKE, 0 } }, // inside witch forest, when going to the room where the walking rock is
- { GID_KQ6, -1, 30, 0, "rats", "changeState", -1, 0, { WORKAROUND_FAKE, 0 } }, // rats in the catacombs - bug #3034597
- { GID_KQ6, -1, 30, 0, "rats", "changeState", -1, 2, { WORKAROUND_FAKE, 0 } }, // rats in the catacombs - bug #3035495
+ { GID_KQ6, -1, 30, 0, "rats", "changeState", -1, -1, { WORKAROUND_FAKE, 0 } }, // rats in the catacombs (temps 1 - 5) - bugs #3034597, #3035495, #3035824
{ GID_KQ6, 210, 210, 0, "rm210", "scriptCheck", -1, 0, { WORKAROUND_FAKE, 1 } }, // using inventory in that room - bug #3034565
{ GID_KQ6, 500, 500, 0, "rm500", "init", -1, 0, { WORKAROUND_FAKE, 0 } }, // going to island of the beast
{ GID_KQ6, 520, 520, 0, "rm520", "init", -1, 0, { WORKAROUND_FAKE, 0 } }, // going to boiling water trap on beast isle
@@ -89,10 +88,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
{ GID_LAURABOW2, 230, 21, 0, "dropCluesCode", "doit", -1, 1, { WORKAROUND_FAKE, 0 } }, // when asking the reporter about the burglary - bug #3035068
{ GID_LSL1, 250, 250, 0, "increase", "handleEvent", -1, 2, { WORKAROUND_FAKE, 0 } }, // casino, playing game, increasing bet
{ GID_LSL1, 720, 720, 0, "rm720", "init", -1, 0, { WORKAROUND_FAKE, 0 } }, // age check room
- { GID_LSL3, 340, 340, 0, "ComicScript", "changeState", -1, 200, { WORKAROUND_FAKE, 0 } }, // right after entering the 3 ethnic groups inside comedy club
- { GID_LSL3, 340, 340, 0, "ComicScript", "changeState", -1, 201, { WORKAROUND_FAKE, 0 } }, // see above
- { GID_LSL3, 340, 340, 0, "ComicScript", "changeState", -1, 202, { WORKAROUND_FAKE, 0 } }, // see above
- { GID_LSL3, 340, 340, 0, "ComicScript", "changeState", -1, 203, { WORKAROUND_FAKE, 0 } }, // see above
+ { GID_LSL3, 340, 340, 0, "ComicScript", "changeState", -1, -1, { WORKAROUND_FAKE, 0 } }, // right after entering the 3 ethnic groups inside comedy club (temps 200, 201, 202, 203)
{ GID_LSL3, -1, 997, 0, "TheMenuBar", "handleEvent", -1, 1, { WORKAROUND_FAKE, 0xf } }, // when setting volume the first time, this temp is used to set volume on entry (normally it would have been initialized to 's')
{ GID_LSL6, -1, 85, 0, "washcloth", "doVerb", -1, 0, { WORKAROUND_FAKE, 0 } }, // washcloth in inventory
{ GID_LSL6, -1, 928, -1, "Narrator", "startText", -1, 0, { WORKAROUND_FAKE, 0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class