[Scummvm-cvs-logs] SF.net SVN: scummvm:[47640] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jan 28 11:34:22 CET 2010
Revision: 47640
http://scummvm.svn.sourceforge.net/scummvm/?rev=47640&view=rev
Author: thebluegr
Date: 2010-01-28 10:34:11 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Removed a hack for the demo version of Torin's passage. It errors out because the static selector vocabulary for SCI2+ games isn't implemented yet
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/static_selectors.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp 2010-01-28 10:31:37 UTC (rev 47639)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp 2010-01-28 10:34:11 UTC (rev 47640)
@@ -84,6 +84,10 @@
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 @@
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;
}
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2010-01-28 10:31:37 UTC (rev 47639)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2010-01-28 10:34:11 UTC (rev 47640)
@@ -353,15 +353,7 @@
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:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list