diff options
Diffstat (limited to 'engines/sci/engine/vm.cpp')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 274b0bbbc9..c94fdac034 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -41,7 +41,6 @@ namespace Sci { const reg_t NULL_REG = {0, 0}; const reg_t SIGNAL_REG = {0, SIGNAL_OFFSET}; const reg_t TRUE_REG = {0, 1}; -//#define VM_DEBUG_SEND // Enable the define below to have the VM abort on cases where a conditional // statement is followed by an unconditional jump (which will most likely lead // to an infinite loop). Aids in detecting script bugs such as #3040722. @@ -233,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; |