aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-03-21 12:36:57 +0000
committerJohannes Schickel2010-03-21 12:36:57 +0000
commita725b490e8a190e276fc689d4a147b7c49e98d7c (patch)
tree0eb1f020515793f2e21db7be0b4c10c92f53ae9d
parent68f5f0893074853a56797d2d36a937f198a4e22d (diff)
downloadscummvm-rg350-a725b490e8a190e276fc689d4a147b7c49e98d7c.tar.gz
scummvm-rg350-a725b490e8a190e276fc689d4a147b7c49e98d7c.tar.bz2
scummvm-rg350-a725b490e8a190e276fc689d4a147b7c49e98d7c.zip
Fix shadow member of this warnings of gcc.
svn-id: r48355
-rw-r--r--engines/m4/globals.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/m4/globals.cpp b/engines/m4/globals.cpp
index 87d3fd7f42..1768c71787 100644
--- a/engines/m4/globals.cpp
+++ b/engines/m4/globals.cpp
@@ -415,24 +415,24 @@ const char *MadsGlobals::loadMessage(uint index) {
/**
* Adds the specified scene number to list of scenes previously visited
*/
-void MadsGlobals::addVisitedScene(int sceneNumber) {
- if (!isSceneVisited(sceneNumber))
- _visitedScenes.push_back(sceneNumber);
+void MadsGlobals::addVisitedScene(int newSceneNumber) {
+ if (!isSceneVisited(newSceneNumber))
+ _visitedScenes.push_back(newSceneNumber);
}
/**
* Returns true if the specified scene has been previously visited
*/
-bool MadsGlobals::isSceneVisited(int sceneNumber) {
+bool MadsGlobals::isSceneVisited(int checkSceneNumber) {
Common::List<int>::iterator i;
for (i = _visitedScenes.begin(); i != _visitedScenes.end(); ++i)
- if (*i == sceneNumber)
+ if (*i == checkSceneNumber)
return true;
return false;
}
-void MadsGlobals::removeVisitedScene(int sceneNumber) {
- _visitedScenes.remove(sceneNumber);
+void MadsGlobals::removeVisitedScene(int oldSceneNumber) {
+ _visitedScenes.remove(oldSceneNumber);
}
/*--------------------------------------------------------------------------*/