diff options
| -rw-r--r-- | engines/sci/engine/static_selectors.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index 8c501dd202..c8d659bbba 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -84,6 +84,10 @@ Common::StringList Kernel::checkStaticSelectorNames() { const SelectorRemap *selectorRemap = sciSelectorRemap; int i; + if (getSciVersion() >= SCI_VERSION_2) { + error("SCI2+ static selector table is not implemented yet"); + } + // Resize the list of selector names and fill in the SCI 0 names. names.resize(count); for (i = 0; i < offset; i++) @@ -105,7 +109,7 @@ Common::StringList Kernel::checkStaticSelectorNames() { names.resize(selectorRemap->slot + 1); if (getSciVersion() >= selectorRemap->minVersion && getSciVersion() <= selectorRemap->maxVersion) { // The SCI1 selectors we use exist in SCI1.1 too, offset by 3 - if (selectorRemap->minVersion == SCI_VERSION_1_EARLY && getSciVersion() == SCI_VERSION_1_1) + if (selectorRemap->minVersion >= SCI_VERSION_1_EARLY && getSciVersion() == SCI_VERSION_1_1) slot -= 3; names[slot] = selectorRemap->name; } diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index e636935908..024df9ea67 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -353,15 +353,7 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt ObjVarRef varp; switch (lookup_selector(s->_segMan, send_obj, selector, &varp, &funcp)) { case kSelectorNone: -#ifdef ENABLE_SCI32 - // HACK: Temporarily switch to a warning in SCI32 games until we can figure out why Torin has - // an invalid selector. - if (getSciVersion() >= SCI_VERSION_2) - warning("Send to invalid selector 0x%x of object at %04x:%04x", 0xffff & selector, PRINT_REG(send_obj)); - else -#endif - error("Send to invalid selector 0x%x of object at %04x:%04x", 0xffff & selector, PRINT_REG(send_obj)); - + error("Send to invalid selector 0x%x of object at %04x:%04x", 0xffff & selector, PRINT_REG(send_obj)); break; case kSelectorVariable: |