[Scummvm-cvs-logs] SF.net SVN: scummvm:[48355] scummvm/trunk/engines/m4/globals.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Mar 21 13:36:57 CET 2010


Revision: 48355
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48355&view=rev
Author:   lordhoto
Date:     2010-03-21 12:36:57 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
Fix shadow member of this warnings of gcc.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.cpp

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-03-21 10:53:13 UTC (rev 48354)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-03-21 12:36:57 UTC (rev 48355)
@@ -415,24 +415,24 @@
 /**
  * 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);
 }
 
 /*--------------------------------------------------------------------------*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list