[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.24,1.25

Max Horn fingolfin at users.sourceforge.net
Mon Oct 28 12:36:03 CET 2002


Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv21669/common

Modified Files:
	gameDetector.cpp 
Log Message:
fixed shadow warning

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gameDetector.cpp	28 Oct 2002 09:03:01 -0000	1.24
+++ gameDetector.cpp	28 Oct 2002 20:35:14 -0000	1.25
@@ -518,16 +518,16 @@
 bool GameDetector::detectGame()
 {
 	const VersionSettings *gnl = version_settings;
-	char *detectGame;
+	char *realGame;
 	_gameId = 0;
 	_gameText.clear();
 
-	if (!(detectGame = (char*)g_config->get("gameid")))
-		detectGame = (char*)_gameFileName.c_str();
-	printf("Looking for %s\n", detectGame);
+	if (!(realGame = (char*)g_config->get("gameid")))
+		realGame = (char*)_gameFileName.c_str();
+	printf("Looking for %s\n", realGame);
 
 	do {
-		if (!scumm_stricmp(detectGame, gnl->filename)) {
+		if (!scumm_stricmp(realGame, gnl->filename)) {
 			_gameId = gnl->id;
 			_gameRealName = gnl->filename;
 			_features = gnl->features;





More information about the Scummvm-git-logs mailing list