diff options
| author | Filippos Karapetis | 2012-06-28 03:29:34 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-06-28 03:29:34 +0300 |
| commit | cc7768869690261d0f6ee3fddc8f0800307813bb (patch) | |
| tree | d6736cf1da1a5fc8e8055414d3f5806a3f85855f /engines | |
| parent | 12b8534e2f56451cd9c142cd3c7725bbde4f9f10 (diff) | |
| download | scummvm-rg350-cc7768869690261d0f6ee3fddc8f0800307813bb.tar.gz scummvm-rg350-cc7768869690261d0f6ee3fddc8f0800307813bb.tar.bz2 scummvm-rg350-cc7768869690261d0f6ee3fddc8f0800307813bb.zip | |
SCI: Remove an incorrect error check in validateExportFunc()
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/script.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index d4143dcceb..037f4ab700 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -422,16 +422,9 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) { } } - if (!offset) { -#ifdef ENABLE_SCI32 - // WORKAROUNDS for invalid (empty) exports - if (g_sci->getGameId() == GID_TORIN && _nr == 64036) { - } else if (g_sci->getGameId() == GID_RAMA && _nr == 64908) { - } else -#endif - error("Request for invalid exported function 0x%x of script %d", pubfunct, _nr); - return NULL; - } + // Note that it's perfectly normal to return a zero offset, especially in + // SCI1.1 and newer games. Examples include script 64036 in Torin's Passage, + // script 64908 in the demo of RAMA and script 1013 in KQ6 floppy. if (offset >= _bufSize) error("Invalid export function pointer"); |