aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2013-04-30 22:46:36 +0200
committerTorbjörn Andersson2013-04-30 22:46:36 +0200
commit0638d85ada88ed7115d96e06216f9daea563d9ac (patch)
treee3d17d4aa00c084d45f11e931e3032235a397ada
parent2284aba71979192d18bf147a18bee807a9f31ea2 (diff)
downloadscummvm-rg350-0638d85ada88ed7115d96e06216f9daea563d9ac.tar.gz
scummvm-rg350-0638d85ada88ed7115d96e06216f9daea563d9ac.tar.bz2
scummvm-rg350-0638d85ada88ed7115d96e06216f9daea563d9ac.zip
SCUMM: Cleanup
We only need to initialize 'args' in runInventoryScript() when we are actually using them.
-rw-r--r--engines/scumm/script.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 59dfc229f2..d025ede47b 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);
}
}