[Scummvm-cvs-logs] SF.net SVN: scummvm:[49573] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 49573
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49573&view=rev
Author:   fingolfin
Date:     2010-06-10 13:43:38 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
SCI: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/engine/kernel.h
    scummvm/trunk/engines/sci/engine/selector.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-06-10 13:41:29 UTC (rev 49572)
+++ scummvm/trunk/engines/sci/console.cpp	2010-06-10 13:43:38 UTC (rev 49573)
@@ -2370,7 +2370,7 @@
 		return true;
 	}
 
-	SelectorType selector_type = lookupSelector(_engine->_gamestate->_segMan, object, selectorId, 0, 0);
+	SelectorType selector_type = lookupSelector(_engine->_gamestate->_segMan, object, selectorId, NULL, NULL);
 
 	if (selector_type == kSelectorNone) {
 		DebugPrintf("Object does not support selector: \"%s\"\n", selector_name);

Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2010-06-10 13:41:29 UTC (rev 49572)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2010-06-10 13:43:38 UTC (rev 49573)
@@ -258,7 +258,6 @@
 
 	ResourceManager *_resMan;
 	SegManager *_segMan;
-	uint32 features;
 
 	// Kernel-related lists
 	Common::StringArray _selectorNames;

Modified: scummvm/trunk/engines/sci/engine/selector.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.cpp	2010-06-10 13:41:29 UTC (rev 49572)
+++ scummvm/trunk/engines/sci/engine/selector.cpp	2010-06-10 13:43:38 UTC (rev 49573)
@@ -204,14 +204,13 @@
 	int k_argc, StackPtr k_argp, int argc, const reg_t *argv) {
 	int i;
 	int framesize = 2 + 1 * argc;
-	reg_t address;
 	int slc_type;
 	StackPtr stackframe = k_argp + k_argc;
 
 	stackframe[0] = make_reg(0, selectorId);  // The selector we want to call
 	stackframe[1] = make_reg(0, argc); // Argument count
 
-	slc_type = lookupSelector(s->_segMan, object, selectorId, NULL, &address);
+	slc_type = lookupSelector(s->_segMan, object, selectorId, NULL, NULL);
 
 	if (slc_type == kSelectorNone) {
 		error("Selector '%s' of object at %04x:%04x could not be invoked",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.