[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.35,1.36 gob.h,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/gob

Modified Files:
	gob.cpp gob.h 
Log Message:
Fix various incorrect usages of the word 'target' instead of 'gameid'; change the ambigiuous 'GameSettings::name' to 'GameSettings::gameid'

Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gob.cpp	18 Jan 2006 17:39:34 -0000	1.35
+++ gob.cpp	21 Jan 2006 13:01:18 -0000	1.36
@@ -107,11 +107,11 @@
 
 // Keep list of different supported games
 static const struct GobGameList {
-	const char *name;
+	const char *gameid;
 	const char *description;
 	uint32 features;
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { name, description, features };
+		GameSettings dummy = { gameid, description, features };
 		return dummy;
 	}
 } gob_list[] = {
@@ -125,7 +125,7 @@
 	GameList games;
 	const GobGameList *g = gob_list;
 
-	while (g->name) {
+	while (g->gameid) {
 		games.push_back(g->toGameSettings());
 		g++;
 	}
@@ -158,7 +158,7 @@
 		for (int i = 0; i < 16; i++) {
 			sprintf(md5str + i * 2, "%02x", (int)md5sum[i]);
 		}
-		for (g = gob_games; g->name; g++) {
+		for (g = gob_games; g->gameid; g++) {
 			if (strcmp(g->md5sum, (char *)md5str) == 0) {
 				detectedGames.push_back(g->toGameSettings());
 			}
@@ -167,7 +167,7 @@
 			printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5str);
 
 			const GobGameList *g1 = gob_list;
-			while (g1->name) {
+			while (g1->gameid) {
 				detectedGames.push_back(g1->toGameSettings());
 				g1++;
 			}
@@ -206,7 +206,7 @@
 	else
 		features = Gob::GF_GOB1;
 
-	for (g = gob_games; g->name; g++) {
+	for (g = gob_games; g->gameid; g++) {
 		if (strcmp(g->md5sum, (char *)md5str) == 0) {
 			features = g->features;
 

Index: gob.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gob.h	14 Jan 2006 09:57:20 -0000	1.17
+++ gob.h	21 Jan 2006 13:01:18 -0000	1.18
@@ -74,12 +74,12 @@
 };
 
 typedef struct GobGameSettings {
-	const char *name;
+	const char *gameid;
 	const char *description;
 	uint32 features;
 	const char *md5sum;
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { name, description, features };
+		GameSettings dummy = { gameid, description, features };
 		return dummy;
 	}
 } GobGameSettings;