- 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

1 files changed, 18 insertions, 1 deletions

diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index d5188665f6..de910e012b 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -943,7 +943,24 @@ void run_vm(EngineState *s, int restoring) {
 						&& !kernel_matches_signature(s->segMan, kfun.signature, argc, scriptState.xs->sp + 1)) {
 					error("[VM] Invalid arguments to kernel call %x", opparams[0]);
 				} else {
-					s->r_acc = kfun.fun(s, opparams[0], argc, scriptState.xs->sp + 1);
+					reg_t *argv = scriptState.xs->sp + 1;
+
+					if (!kfun.isDummy) {
+						s->r_acc = kfun.fun(s, argc, argv);
+					} else {
+						Common::String warningMsg = "Dummy function " + kfun.orig_name + "[";
+						warningMsg += warningMsg.printf("0x%x", opparams[0]);
+						warningMsg += "] invoked - ignoring. Params: ";
+						warningMsg += warningMsg.printf("%d", argc);
+						warningMsg += " (";
+
+						for (int i = 0; i < argc; i++) {
+							warningMsg += warningMsg.printf("%04x:%04x", PRINT_REG(argv[i]));
+							warningMsg += (i == argc - 1 ? ")" : ", ");
+						}
+
+						warning(warningMsg.c_str());
+					}
 				}
 				// Call kernel function