diff options
| author | Martin Kiewitz | 2010-08-11 06:13:08 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-08-11 06:13:08 +0000 |
| commit | c70f16c55dbe1550ad6f6c850b06bc1239d48408 (patch) | |
| tree | e9b0e4c4e072bc1c684d2e9894a2033e1c5bc674 | |
| parent | 42c3cc4c08ed720b39fedbc4463c07f31fefa4ef (diff) | |
| download | scummvm-rg350-c70f16c55dbe1550ad6f6c850b06bc1239d48408.tar.gz scummvm-rg350-c70f16c55dbe1550ad6f6c850b06bc1239d48408.tar.bz2 scummvm-rg350-c70f16c55dbe1550ad6f6c850b06bc1239d48408.zip | |
SCI: making camelot fix camelot-only for now
fixes kq6 getting assert as well (bug 3042866)
svn-id: r51970
| -rw-r--r-- | engines/sci/engine/script.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 4c940804b8..f4129bb1ea 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -332,8 +332,10 @@ uint16 Script::validateExportFunc(int pubfunct) { if (offset == 0) { // Check if the game has a second export table (e.g. script 912 in Camelot) // Fixes bug #3039785 - if (g_sci->getGameId() == GID_ECOQUEST) // cheap fix in here for eco quest 1, [md5] plz look into this TODO FIXME + if (g_sci->getGameId() != GID_CAMELOT) // cheap fix return offset; + // we are getting assert()s in eco quest 1 (right on startup) and kq6 and maybe more + // [md5] plz look into this TODO FIXME const uint16 *secondExportTable = (const uint16 *)findBlock(SCI_OBJ_EXPORTS, 0); if (secondExportTable) { |