diff options
| author | Filippos Karapetis | 2011-10-16 13:00:38 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-10-16 13:01:13 +0300 |
| commit | ffe70730374b2e1c0b9e47832d115e26fa1c8119 (patch) | |
| tree | fa99722fb92cdbe62b23943d5261a5141f675d41 /engines/sci/engine | |
| parent | 01616afecc7ba80447359e3daffe7ec556c024d7 (diff) | |
| download | scummvm-rg350-ffe70730374b2e1c0b9e47832d115e26fa1c8119.tar.gz scummvm-rg350-ffe70730374b2e1c0b9e47832d115e26fa1c8119.tar.bz2 scummvm-rg350-ffe70730374b2e1c0b9e47832d115e26fa1c8119.zip | |
SCI: Script 64036 in Torin's passage contains an invalid export
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 7c22b48ece..c94fdac034 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -232,11 +232,10 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP if (!temp) { #ifdef ENABLE_SCI32 - // HACK: Temporarily switch to a warning in SCI32 games until we can figure out why Torin has - // an invalid exported function. - if (getSciVersion() >= SCI_VERSION_2) - warning("Request for invalid exported function 0x%x of script %d", pubfunct, script); - else + if (g_sci->getGameId() == GID_TORIN && script == 64036) { + // Script 64036 in Torin's Passage is empty and contains an invalid + // (empty) export + } else #endif error("Request for invalid exported function 0x%x of script %d", pubfunct, script); return NULL; |