[Scummvm-cvs-logs] scummvm master -> 72e2fbc1ae68fd9c69445435b34c599b29ffdf58

[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:
72e2fbc1ae NEVERHOOD: Fix GCC warnings about shadowed variables


Commit: 72e2fbc1ae68fd9c69445435b34c599b29ffdf58
    https://github.com/scummvm/scummvm/commit/72e2fbc1ae68fd9c69445435b34c599b29ffdf58
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-06-11T09:26:26-07:00

Commit Message:
NEVERHOOD: Fix GCC warnings about shadowed variables

Changed paths:
    engines/neverhood/console.cpp



diff --git a/engines/neverhood/console.cpp b/engines/neverhood/console.cpp
index 917eae5..eae6b92 100644
--- a/engines/neverhood/console.cpp
+++ b/engines/neverhood/console.cpp
@@ -82,8 +82,8 @@ bool Console::Cmd_Cheat(int argc, const char **argv) {
 	}
 
 	Common::String cheatName = argv[1];
-	int module = _vm->_gameModule->getCurrentModuleNum();
-	int scene = _vm->gameState().sceneNum;
+	int moduleNum = _vm->_gameModule->getCurrentModuleNum();
+	int sceneNum = _vm->gameState().sceneNum;
 
 	if (cheatName == "buttons") {
 		Scene *scene = (Scene *)((GameModule *)_vm->_gameModule->_childObject)->_childObject;
@@ -134,7 +134,7 @@ bool Console::Cmd_Cheat(int argc, const char **argv) {
 
 		DebugPrintf("The radio has been enabled\n");
 	} else if (cheatName == "symbols") {
-		if (module == 1600 && scene == 8) {
+		if (moduleNum == 1600 && sceneNum == 8) {
 			Scene1609 *scene = ((Scene1609 *)((Module1600 *)_vm->_gameModule->_childObject)->_childObject);
 
 			for (int index = 0; index < 12; index++) {