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

[johndoe123]

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:
d4f3f6baa4 NEVERHOOD: Fix warning about shadowed variable


Commit: d4f3f6baa4eae9b6ab47b6f29dbd585a892e791d
    https://github.com/scummvm/scummvm/commit/d4f3f6baa4eae9b6ab47b6f29dbd585a892e791d
Author: johndoe123 (john_doe at techie.com)
Date: 2013-06-11T02:39:28-07:00

Commit Message:
NEVERHOOD: Fix warning about shadowed variable

Changed paths:
    engines/neverhood/console.cpp



diff --git a/engines/neverhood/console.cpp b/engines/neverhood/console.cpp
index c6c22f9..8789128 100644
--- a/engines/neverhood/console.cpp
+++ b/engines/neverhood/console.cpp
@@ -47,11 +47,11 @@ bool Console::Cmd_Room(int argc, const char **argv) {
 		DebugPrintf("Use room <module> <scene> to change rooms\n");
 		DebugPrintf("Modules are incremental by 100, from 1000 to 3000\n");
 	} else {
-		int module = atoi(argv[1]);
-		int scene  = atoi(argv[2]);
+		int newModule = atoi(argv[1]);
+		int newScene  = atoi(argv[2]);
 
-		_vm->gameState().sceneNum = scene;
-		_vm->_gameModule->createModule(module, -1);
+		_vm->gameState().sceneNum = newScene;
+		_vm->_gameModule->createModule(newModule, -1);
 	}
 
 	return true;