- 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, 11 insertions, 11 deletions

diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 70534016ae..ca56cd6cb1 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -33,7 +33,7 @@ namespace Sci {
 
 // Loads arbitrary resources of type 'restype' with resource numbers 'resnrs'
 // This implementation ignores all resource numbers except the first one.
-reg_t kLoad(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kLoad(EngineState *s, int argc, reg_t *argv) {
 	int restype = argv[0].toUint16();
 	int resnr = argv[1].toUint16();
 
@@ -44,7 +44,7 @@ reg_t kLoad(EngineState *s, int, int argc, reg_t *argv) {
 	return make_reg(0, ((restype << 11) | resnr)); // Return the resource identifier as handle
 }
 
-reg_t kLock(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kLock(EngineState *s, int argc, reg_t *argv) {
 	int state = argc > 2 ? argv[2].toUint16() : 1;
 	ResourceType type = (ResourceType)(argv[0].toUint16() & 0x7f);
 	ResourceId id = ResourceId(type, argv[1].toUint16());
@@ -72,7 +72,7 @@ reg_t kLock(EngineState *s, int, int argc, reg_t *argv) {
 }
 
 // Unloads an arbitrary resource of type 'restype' with resource numbber 'resnr'
-reg_t kUnLoad(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kUnLoad(EngineState *s, int argc, reg_t *argv) {
 	int restype = argv[0].toUint16();
 	reg_t resnr = argv[1];
 
@@ -82,7 +82,7 @@ reg_t kUnLoad(EngineState *s, int, int argc, reg_t *argv) {
 	return s->r_acc;
 }
 
-reg_t kResCheck(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kResCheck(EngineState *s, int argc, reg_t *argv) {
 	Resource *res = NULL;
 	ResourceType restype = (ResourceType)(argv[0].toUint16() & 0x7f);
 
@@ -102,7 +102,7 @@ reg_t kResCheck(EngineState *s, int, int argc, reg_t *argv) {
 	return make_reg(0, res != NULL);
 }
 
-reg_t kClone(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kClone(EngineState *s, int argc, reg_t *argv) {
 	reg_t parent_addr = argv[0];
 	Object *parent_obj = s->segMan->getObject(parent_addr);
 	reg_t clone_addr;
@@ -138,7 +138,7 @@ reg_t kClone(EngineState *s, int, int argc, reg_t *argv) {
 
 extern void _k_view_list_mark_free(EngineState *s, reg_t off);
 
-reg_t kDisposeClone(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kDisposeClone(EngineState *s, int argc, reg_t *argv) {
 	SegManager *segMan = s->segMan;
 	reg_t victim_addr = argv[0];
 	Clone *victim_obj = s->segMan->getObject(victim_addr);
@@ -176,7 +176,7 @@ reg_t kDisposeClone(EngineState *s, int, int argc, reg_t *argv) {
 }
 
 // Returns script dispatch address index in the supplied script
-reg_t kScriptID(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kScriptID(EngineState *s, int argc, reg_t *argv) {
 	int script = argv[0].toUint16();
 	int index = (argc > 1) ? argv[1].toUint16() : 0;
 
@@ -205,7 +205,7 @@ reg_t kScriptID(EngineState *s, int, int argc, reg_t *argv) {
 	return make_reg(scriptSeg, s->segMan->validateExportFunc(index, scriptSeg));
 }
 
-reg_t kDisposeScript(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kDisposeScript(EngineState *s, int argc, reg_t *argv) {
 	int script = argv[0].offset;
 
 	// Work around QfG1 graveyard bug
@@ -231,14 +231,14 @@ reg_t kDisposeScript(EngineState *s, int, int argc, reg_t *argv) {
 	}
 }
 
-reg_t kIsObject(EngineState *s, int, int argc, reg_t *argv) {
-	if (argv[0].offset == 0xffff) // Treated specially
+reg_t kIsObject(EngineState *s, int argc, reg_t *argv) {
+	if (argv[0].offset == SIGNAL_OFFSET) // Treated specially
 		return NULL_REG;
 	else
 		return make_reg(0, s->segMan->isHeapObject(argv[0]));
 }
 
-reg_t kRespondsTo(EngineState *s, int, int argc, reg_t *argv) {
+reg_t kRespondsTo(EngineState *s, int argc, reg_t *argv) {
 	reg_t obj = argv[0];
 	int selector = argv[1].toUint16();