From 515cc3c369551b15503b982a007b645843a781a1 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Wed, 28 Jul 2010 17:45:19 +0000 Subject: SCI: Set the LB2 floppy open selector so we don't have to have duplicate workaround entries svn-id: r51429 --- engines/sci/engine/static_selectors.cpp | 7 +++++++ engines/sci/engine/workarounds.cpp | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index c062c4e786..55e18613e0 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -175,6 +175,13 @@ Common::StringArray Kernel::checkStaticSelectorNames() { names.resize(111); names[110] = "init"; + } else if (g_sci->getGameId() == GID_LAURABOW2) { + // The floppy of version needs the open selector set to match up with the CD version's + // workaround - bug #3035694 + if (names.size() < 190) + names.resize(190); + + names[189] = "open"; } #ifdef ENABLE_SCI32 diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index 7c0fc47003..fa28e40801 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -86,7 +86,6 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = { { GID_KQ7, 30, 64996, 0, "User", "handleEvent", -1, 1, { WORKAROUND_FAKE, 0 } }, // called when pushing a keyboard key { GID_LAURABOW, 44, 967, 0, "myIcon", "cycle", -1, 1, { WORKAROUND_FAKE, 0 } }, // second dialog box after the intro, when talking with Lillian - bug #3034985 { GID_LAURABOW2, -1, 24, 0, "gcWin", "open", -1, 5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu - { GID_LAURABOW2, -1, 24, 0, "gcWin", "", -1, 5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu (floppy version, which doesn't have a selector vocabulary) - bug #3035694 { 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 -- cgit v1.2.3