[Scummvm-cvs-logs] scummvm master -> ed5adcbc59bc6a99837c0537f8461b38717728d8

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ed5adcbc59 SCUMM HE: Fix bug with parameter initialization, add more debug output


Commit: ed5adcbc59bc6a99837c0537f8461b38717728d8
    https://github.com/scummvm/scummvm/commit/ed5adcbc59bc6a99837c0537f8461b38717728d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-24T11:07:48+02:00

Commit Message:
SCUMM HE: Fix bug with parameter initialization, add more debug output

Changed paths:
    engines/scumm/he/moonbase/ai_main.cpp
    engines/scumm/he/moonbase/moonbase.cpp



diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp
index 8ed3c48..554d2ee 100644
--- a/engines/scumm/he/moonbase/ai_main.cpp
+++ b/engines/scumm/he/moonbase/ai_main.cpp
@@ -2719,6 +2719,8 @@ int getUnitsWithinRadius(int x, int y, int radius) {
 	assert(y >= 0);
 	assert(radius >= 0);
 
+	debug(0, "getUnitsWithinRadius(%d, %d, %d)", x, y, radius);
+
 	int retVal = _vm->_moonbase->callScummFunction(MCP_params[F_GET_UNITS_WITHIN_RADIUS], 3, x, y, radius);
 	return retVal;
 }
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index cc25c27..d7069e7 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -43,9 +43,21 @@ int Moonbase::callScummFunction(int scriptNumber, int paramCount,...) {
 	va_start(va_params, paramCount);
 	int args[25];
 
-	for (int i = 0; i < paramCount; i++)
+	memset(args, 0, sizeof(args));
+
+	Common::String str;
+	str = Common::String::format("callScummFunction(%d, [", scriptNumber);
+
+	for (int i = 0; i < paramCount; i++) {
 		args[i] = va_arg(va_params, int);
 
+		str += Common::String::format("%d ", args[i]);
+	}
+	str += "])";
+
+	debug(0, "%s", str.c_str());
+
+
 	va_end(va_params);
 
 	_vm->runScript(scriptNumber, 0, 1, args);