aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-25 20:46:08 +0000
committerMartin Kiewitz2010-06-25 20:46:08 +0000
commit683d54a74660745d6bd408788170b19adb08581e (patch)
tree486cfc4700422cc850c842365bbfe01c72a9dd0d /engines
parent784c655e82f2e1f80bda0a40005ed91754dff844 (diff)
downloadscummvm-rg350-683d54a74660745d6bd408788170b19adb08581e.tar.gz
scummvm-rg350-683d54a74660745d6bd408788170b19adb08581e.tar.bz2
scummvm-rg350-683d54a74660745d6bd408788170b19adb08581e.zip
SCI: adding workaround for uninitialized read in sq1
svn-id: r50287
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/vm.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 9ebf8ca53d..29def1765b 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -191,13 +191,14 @@ struct UninitializedReadWorkaround {
};
static const UninitializedReadWorkaround uninitializedReadWorkarounds[] = {
- { GID_LAURABOW2, 24, "gcWin", "open", 5, 0xf }, // is used as priority for game menu
- { GID_FREDDYPHARKAS, 24, "gcWin", "open", 5, 0xf }, // is used as priority for game menu
- { GID_FREDDYPHARKAS, 31, "quitWin", "open", 5, 0xf }, // is used as priority for game menu
- { GID_LSL1, 720, "rm720", "init", 0, 0 }, // age check room
- { GID_ISLANDBRAIN, 140, "piece", "init", 3, 1 }, // some initialization variable. bnt is done on it, and it should be non-0
- { GID_SQ4, 928, "Narrator", "startText", 1000, 1 }, // sq4cd: method returns this to the caller
- { (SciGameId)0, -1, NULL, NULL, 0, 0 }
+ { GID_LAURABOW2, 24, "gcWin", "open", 5, 0xf }, // is used as priority for game menu
+ { GID_FREDDYPHARKAS, 24, "gcWin", "open", 5, 0xf }, // is used as priority for game menu
+ { GID_FREDDYPHARKAS, 31, "quitWin", "open", 5, 0xf }, // is used as priority for game menu
+ { GID_LSL1, 720, "rm720", "init", 0, 0 }, // age check room
+ { GID_ISLANDBRAIN, 140, "piece", "init", 3, 1 }, // some initialization variable. bnt is done on it, and it should be non-0
+ { GID_SQ1, 703, "fromAirlock", "<invalid>", 0, 0 }, // sub that's called from fromAirlock::changeState
+ { GID_SQ4, 928, "Narrator", "startText", 1000, 1 }, // sq4cd: method returns this to the caller
+ { (SciGameId)0, -1, NULL, NULL, 0, 0 }
};
static reg_t validate_read_var(reg_t *r, reg_t *stack_base, int type, int max, int index, int line, reg_t default_value) {