diff options
| author | Filippos Karapetis | 2012-07-02 11:37:55 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-07-02 12:49:08 +0300 |
| commit | 44935117f493b2e256b5a2c701b63cef57d872af (patch) | |
| tree | 4b46d068380d58a89fd073f7afb0f3b373676bc1 | |
| parent | 2c161796c5688a1f76dcf66f1e66eb9bcd1e0f23 (diff) | |
| download | scummvm-rg350-44935117f493b2e256b5a2c701b63cef57d872af.tar.gz scummvm-rg350-44935117f493b2e256b5a2c701b63cef57d872af.tar.bz2 scummvm-rg350-44935117f493b2e256b5a2c701b63cef57d872af.zip | |
SCI: Fix a workaround for an uninitialized variable in SQ4CD
This makes sure that the workaround works for subclassed objects as well,
such as "theProfessor" talker. Fixes bug #3539350 - "SCI: SQ4 CD -
Crash in sewer when text and speech enabled"
| -rw-r--r-- | engines/sci/engine/workarounds.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp index ecb1e4c2d5..15fca0322c 100644 --- a/engines/sci/engine/workarounds.cpp +++ b/engines/sci/engine/workarounds.cpp @@ -162,7 +162,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = { { GID_SQ1, -1, 703, 0, "", "export 1", -1, 0, { WORKAROUND_FAKE, 0 } }, // sub that's called from several objects while on sarien battle cruiser { GID_SQ1, -1, 703, 0, "firePulsar", "changeState", 0x18a, 0, { WORKAROUND_FAKE, 0 } }, // export 1, but called locally (when shooting at aliens) { GID_SQ4, -1, 398, 0, "showBox", "changeState", -1, 0, { WORKAROUND_FAKE, 0 } }, // CD: called when rummaging in Software Excess bargain bin - { GID_SQ4, -1, 928, 0, "Narrator", "startText", -1, 1000, { WORKAROUND_FAKE, 1 } }, // CD: method returns this to the caller + { GID_SQ4, -1, 928, -1, "Narrator", "startText", -1, 1000, { WORKAROUND_FAKE, 1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously { GID_SQ5, 201, 201, 0, "buttonPanel", "doVerb", -1, 0, { WORKAROUND_FAKE, 1 } }, // when looking at the orange or red button - bug #3038563 { GID_SQ6, -1, 0, 0, "SQ6", "init", -1, 2, { WORKAROUND_FAKE, 0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100) { GID_SQ6, 100, 64950, 0, "View", "handleEvent", -1, 0, { WORKAROUND_FAKE, 0 } }, // called when pressing "Start game" in the main menu |