1 files changed, 43 insertions, 15 deletions

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index d76199c794..157884fac3 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -43,8 +43,17 @@ Kernel::Kernel(ResourceManager *resMan, SegManager *segMan)
 }
 
 Kernel::~Kernel() {
-	for (KernelFunctionArray::iterator i = _kernelFuncs.begin(); i != _kernelFuncs.end(); ++i)
-		delete[] i->signature;
+	for (KernelFunctionArray::iterator it = _kernelFuncs.begin(); it != _kernelFuncs.end(); ++it) {
+		if (it->subFunctionCount) {
+			uint16 subFunctionNr = 0;
+			while (subFunctionNr < it->subFunctionCount) {
+				delete[] it->subFunctions[subFunctionNr].signature;
+				subFunctionNr++;
+			}
+			delete[] it->subFunctions;
+		}
+		delete[] it->signature;
+	}
 }
 
 uint Kernel::getSelectorNamesSize() const {
@@ -56,12 +65,14 @@ const Common::String &Kernel::getSelectorName(uint selector) {
 		// This should only occur in games w/o a selector-table
 		//  We need this for proper workaround tables
 		// TODO: maybe check, if there is a fixed selector-table and error() out in that case
-		for (uint loopSelector = _selectorNames.size(); loopSelector <= selector; loopSelector++) {
-			Common::String newSelectorName;
-			newSelectorName = newSelectorName.printf("<noname %d>", loopSelector);
-			_selectorNames.push_back(newSelectorName);
-		}
+		for (uint loopSelector = _selectorNames.size(); loopSelector <= selector; ++loopSelector)
+			_selectorNames.push_back(Common::String::printf("<noname%d>", loopSelector));
 	}
+
+	// Ensure that the selector has a name
+	if (_selectorNames[selector].empty())
+		_selectorNames[selector] = Common::String::printf("<noname%d>", selector);
+
 	return _selectorNames[selector];
 }
 
@@ -650,7 +661,7 @@ void Kernel::mapFunctions() {
 	return;
 }
 
-bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
+bool Kernel::debugSetFunction(const char *kernelName, int logging, int breakpoint) {
 	if (strcmp(kernelName, "*")) {
 		for (uint id = 0; id < _kernelFuncs.size(); id++) {
 			if (_kernelFuncs[id].name) {
@@ -660,14 +671,21 @@ bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
 						KernelSubFunction *kernelSubCall = _kernelFuncs[id].subFunctions;
 						uint kernelSubCallCount = _kernelFuncs[id].subFunctionCount;
 						for (uint subId = 0; subId < kernelSubCallCount; subId++) {
-							if (kernelSubCall->function)
-								kernelSubCall->debugLogging = logging;
+							if (kernelSubCall->function) {
+								if (logging != -1)
+									kernelSubCall->debugLogging = logging == 1 ? true : false;
+								if (breakpoint != -1)
+									kernelSubCall->debugBreakpoint = breakpoint == 1 ? true : false;
+							}
 							kernelSubCall++;
 						}
 						return true;
 					}
 					// function name matched, set for this one and exit
-					_kernelFuncs[id].debugLogging = logging;
+					if (logging != -1)
+						_kernelFuncs[id].debugLogging = logging == 1 ? true : false;
+					if (breakpoint != -1)
+						_kernelFuncs[id].debugBreakpoint = breakpoint == 1 ? true : false;
 					return true;
 				} else {
 					// main name was not matched
@@ -679,7 +697,10 @@ bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
 							if (kernelSubCall->function) {
 								if (strcmp(kernelName, kernelSubCall->name) == 0) {
 									// sub-function name matched, set for this one and exit
-									kernelSubCall->debugLogging = logging;
+									if (logging != -1)
+										kernelSubCall->debugLogging = logging == 1 ? true : false;
+									if (breakpoint != -1)
+										kernelSubCall->debugBreakpoint = breakpoint == 1 ? true : false;
 									return true;
 								}
 							}
@@ -696,14 +717,21 @@ bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
 		if (_kernelFuncs[id].name) {
 			if (!_kernelFuncs[id].subFunctions) {
 				// No sub-functions, enable actual kernel function
-				_kernelFuncs[id].debugLogging = logging;
+				if (logging != -1)
+					_kernelFuncs[id].debugLogging = logging == 1 ? true : false;
+				if (breakpoint != -1)
+					_kernelFuncs[id].debugBreakpoint = breakpoint == 1 ? true : false;
 			} else {
 				// Sub-Functions available, enable those too
 				KernelSubFunction *kernelSubCall = _kernelFuncs[id].subFunctions;
 				uint kernelSubCallCount = _kernelFuncs[id].subFunctionCount;
 				for (uint subId = 0; subId < kernelSubCallCount; subId++) {
-					if (kernelSubCall->function)
-						kernelSubCall->debugLogging = logging;
+					if (kernelSubCall->function) {
+						if (logging != -1)
+							kernelSubCall->debugLogging = logging == 1 ? true : false;
+						if (breakpoint != -1)
+							kernelSubCall->debugBreakpoint = breakpoint == 1 ? true : false;
+					}
 					kernelSubCall++;
 				}
 			}