[Scummvm-cvs-logs] scummvm master -> 0638d85ada88ed7115d96e06216f9daea563d9ac

[eriktorbjorn]

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:
0638d85ada SCUMM: Cleanup


Commit: 0638d85ada88ed7115d96e06216f9daea563d9ac
    https://github.com/scummvm/scummvm/commit/0638d85ada88ed7115d96e06216f9daea563d9ac
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-04-30T13:46:36-07:00

Commit Message:
SCUMM: Cleanup

We only need to initialize 'args' in runInventoryScript() when we
are actually using them.

Changed paths:
    engines/scumm/script.cpp



diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 59dfc22..d025ede 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -755,13 +755,13 @@ void ScummEngine::stopObjectCode() {
 }
 
 void ScummEngine::runInventoryScript(int i) {
-	int args[NUM_SCRIPT_LOCALS];
-	memset(args, 0, sizeof(args));
-	args[0] = i;
 	if (VAR(VAR_INVENTORY_SCRIPT)) {
 		if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) {
 			inventoryScriptIndy3Mac();
 		} else {
+			int args[NUM_SCRIPT_LOCALS];
+			memset(args, 0, sizeof(args));
+			args[0] = i;
 			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args);
 		}
 	}