[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.126,1.127

Max Horn fingolfin at users.sourceforge.net
Sat Nov 1 08:40:05 CET 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7194/sky

Modified Files:
	sky.cpp 
Log Message:
cleanup of game detector functions

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- sky.cpp	1 Nov 2003 16:02:14 -0000	1.126
+++ sky.cpp	1 Nov 2003 16:39:26 -0000	1.127
@@ -78,17 +78,12 @@
 
 #undef WITH_DEBUG_CHEATS
 
-static const GameSettings sky_settings[] = {
-	/* Beneath a Steel Sky */
-	{"sky", "Beneath a Steel Sky", MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE, 0, "sky.dsk" },
-	{NULL, NULL, MDT_NONE, 0, NULL}
-};
+static const GameSettings skySetting =
+	{"sky", "Beneath a Steel Sky", MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE, 0, "sky.dsk" };
 
 GameList Engine_SKY_gameList() {
-	const GameSettings *g = sky_settings;
 	GameList games;
-	while (g->gameName)
-		games.push_back(*g++);
+	games.push_back(skySetting);
 	return games;
 }
 
@@ -100,7 +95,7 @@
 
 		if (0 == scumm_stricmp("sky.dsk", fileName)) {
 			// Match found, add to list of candidates, then abort inner loop.
-			detectedGames.push_back(sky_settings[0]);
+			detectedGames.push_back(skySetting);
 			break;
 		}
 	}





More information about the Scummvm-git-logs mailing list