aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2013-06-11 18:26:26 +0200
committerTorbjörn Andersson2013-06-11 18:26:26 +0200
commit72e2fbc1ae68fd9c69445435b34c599b29ffdf58 (patch)
tree8e4c29ee7edbc9865564e6c8352293bacbee999b /engines
parent974e7e80a83a0b44108ff9bdcb2863382b79b32e (diff)
downloadscummvm-rg350-72e2fbc1ae68fd9c69445435b34c599b29ffdf58.tar.gz
scummvm-rg350-72e2fbc1ae68fd9c69445435b34c599b29ffdf58.tar.bz2
scummvm-rg350-72e2fbc1ae68fd9c69445435b34c599b29ffdf58.zip
NEVERHOOD: Fix GCC warnings about shadowed variables
Diffstat (limited to 'engines')
-rw-r--r--engines/neverhood/console.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/neverhood/console.cpp b/engines/neverhood/console.cpp
index 917eae596f..eae6b92ba6 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++) {