diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/sci/engine/vm.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sci/engine/vm.cpp')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index cbe4736ba2..162dce9fcc 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -235,6 +235,9 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP if (g_sci->getGameId() == GID_TORIN && script == 64036) { // Script 64036 in Torin's Passage is empty and contains an invalid // (empty) export + } else if (g_sci->getGameId() == GID_RAMA && script == 64908) { + // Script 64908 in the demo of RAMA contains an invalid (empty) + // export } else #endif error("Request for invalid exported function 0x%x of script %d", pubfunct, script); |