thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: cleanup

Browse source 
svn-id: r49573
This commit is contained in:
Max Horn 2010-06-10 13:43:38 +00:00
parent c8ee854600
commit afa2af5dfb
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/console.cpp
View file

@ -2370,7 +2370,7 @@ bool Console::cmdSend(int argc, const char **argv) {
return true; 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) { if (selector_type == kSelectorNone) {
DebugPrintf("Object does not support selector: \"%s\"\n", selector_name); DebugPrintf("Object does not support selector: \"%s\"\n", selector_name);

1
engines/sci/engine/kernel.h
View file

@ -258,7 +258,6 @@ private:
ResourceManager *_resMan; ResourceManager *_resMan;
SegManager *_segMan; SegManager *_segMan;
uint32 features;
// Kernel-related lists // Kernel-related lists
Common::StringArray _selectorNames; Common::StringArray _selectorNames;

3
engines/sci/engine/selector.cpp
View file

@ -204,14 +204,13 @@ void invokeSelector(EngineState *s, reg_t object, int selectorId,
int k_argc, StackPtr k_argp, int argc, const reg_t *argv) { int k_argc, StackPtr k_argp, int argc, const reg_t *argv) {
int i; int i;
int framesize = 2 + 1 * argc; int framesize = 2 + 1 * argc;
reg_t address;
int slc_type; int slc_type;
StackPtr stackframe = k_argp + k_argc; StackPtr stackframe = k_argp + k_argc;
stackframe[0] = make_reg(0, selectorId); // The selector we want to call stackframe[0] = make_reg(0, selectorId); // The selector we want to call
stackframe[1] = make_reg(0, argc); // Argument count 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) { if (slc_type == kSelectorNone) {
error("Selector '%s' of object at %04x:%04x could not be invoked", error("Selector '%s' of object at %04x:%04x could not be invoked",