diff options
| author | Max Horn | 2010-06-10 13:43:38 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-10 13:43:38 +0000 |
| commit | afa2af5dfb0214c4aeeb2f21ef43dca5e3886181 (patch) | |
| tree | 1b3b1ab9b694659f42d854ba52aa877e7138c7ef | |
| parent | c8ee854600710f36f09d8375fbe51e1924d97320 (diff) | |
| download | scummvm-rg350-afa2af5dfb0214c4aeeb2f21ef43dca5e3886181.tar.gz scummvm-rg350-afa2af5dfb0214c4aeeb2f21ef43dca5e3886181.tar.bz2 scummvm-rg350-afa2af5dfb0214c4aeeb2f21ef43dca5e3886181.zip | |
SCI: cleanup
svn-id: r49573
| -rw-r--r-- | engines/sci/console.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kernel.h | 1 | ||||
| -rw-r--r-- | engines/sci/engine/selector.cpp | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 3f123fa41b..c2ea377f9b 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -2370,7 +2370,7 @@ bool Console::cmdSend(int argc, const char **argv) { 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); diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 990e2aff17..c5513f1240 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -258,7 +258,6 @@ private: ResourceManager *_resMan; SegManager *_segMan; - uint32 features; // Kernel-related lists Common::StringArray _selectorNames; diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp index eafed029c5..15b008430b 100644 --- a/engines/sci/engine/selector.cpp +++ b/engines/sci/engine/selector.cpp @@ -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 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", |