diff options
| author | Filippos Karapetis | 2010-01-06 14:04:56 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-06 14:04:56 +0000 |
| commit | 027fe079c946d2fc367bebe15244520b035e8990 (patch) | |
| tree | ec6c01d7a06630f91e1d620ba6de29bb712dfb9e | |
| parent | 9272822486e00db030b335c1ad2c5cceac231908 (diff) | |
| download | scummvm-rg350-027fe079c946d2fc367bebe15244520b035e8990.tar.gz scummvm-rg350-027fe079c946d2fc367bebe15244520b035e8990.tar.bz2 scummvm-rg350-027fe079c946d2fc367bebe15244520b035e8990.zip | |
The error inside execute_method() has been restored, it's only a warning for SCI2+ games for now, till we figure out what's wrong
svn-id: r47079
| -rw-r--r-- | engines/sci/engine/vm.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index f9fb37f7a2..6174dc838c 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -226,7 +226,14 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP const int temp = s->_segMan->validateExportFunc(pubfunct, seg); if (!temp) { - warning("Request for invalid exported function 0x%x of script 0x%x", pubfunct, script); +#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 0x%x", pubfunct, script); + else +#endif + error("Request for invalid exported function 0x%x of script 0x%x", pubfunct, script); return NULL; } |