aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/selector.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-29 14:24:07 +0000
committerFilippos Karapetis2009-09-29 14:24:07 +0000
commitf9296a64459a09961bdf61fa4dbb3d3f524a4c25 (patch)
tree47e58f397493e87f18560b7891cbb23afa668eb2 /engines/sci/engine/selector.cpp
parentaf4c6c5f5b642e6a53596b7a00d57e2060ba0693 (diff)
downloadscummvm-rg350-f9296a64459a09961bdf61fa4dbb3d3f524a4c25.tar.gz
scummvm-rg350-f9296a64459a09961bdf61fa4dbb3d3f524a4c25.tar.bz2
scummvm-rg350-f9296a64459a09961bdf61fa4dbb3d3f524a4c25.zip
- Changed the unimplemented debug SCI kernel functions (InspectObj, ShowSends, ShowObjs, ShowFree, StackUsage and Profiler) to be dummy functions - we have our own debugger, and don't use these functions for debugging
- Removed the function number parameter from all kernel functions, as it's no longer needed, and removed the FAKE_FUNCT_NR hack - Removed kUnknown() and kStub() - Dummy/unknown kernel functions are no longer invoked, and a warning is shown instead, with the paremeters passed to them Note: there is an evil hack used for debugging scripts in invoke_selector(), which probably no longer works now svn-id: r44461
Diffstat (limited to 'engines/sci/engine/selector.cpp')
-rw-r--r--engines/sci/engine/selector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp
index 93d84dc5e1..8ab5582417 100644
--- a/engines/sci/engine/selector.cpp
+++ b/engines/sci/engine/selector.cpp
@@ -53,7 +53,7 @@ void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_
*address.getPointer(segMan) = value;
}
-int invoke_selector(EngineState *s, reg_t object, int selector_id, SelectorInvocation noinvalid, int kfunct,
+int invoke_selector(EngineState *s, reg_t object, int selector_id, SelectorInvocation noinvalid,
StackPtr k_argp, int k_argc, const char *fname, int line, int argc, ...) {
va_list argp;
int i;
@@ -88,7 +88,7 @@ int invoke_selector(EngineState *s, reg_t object, int selector_id, SelectorInvoc
ExecStack *xstack;
xstack = add_exec_stack_entry(s, NULL_REG, NULL, NULL_REG, k_argc, k_argp - 1, 0, NULL_REG,
s->_executionStack.size()-1, SCI_XS_CALLEE_LOCALS);
- xstack->selector = -42 - kfunct; // Evil debugging hack to identify kernel function
+ xstack->selector = -42 + 1; // Evil debugging hack to identify kernel function
xstack->type = EXEC_STACK_TYPE_KERNEL;
// Now commit the actual function: