[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.155,1.156

Max Horn fingolfin at users.sourceforge.net
Sat Jan 21 05:02:03 CET 2006


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

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

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- sword2.cpp	19 Jan 2006 23:11:56 -0000	1.155
+++ sword2.cpp	21 Jan 2006 13:01:20 -0000	1.156
@@ -46,12 +46,12 @@
 #endif
 
 struct Sword2GameSettings {
-	const char *name;
+	const char *gameid;
 	const char *description;
 	uint32 features;
 	const char *detectname;
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { name, description, features };
+		GameSettings dummy = { gameid, description, features };
 		return dummy;
 	}
 };
@@ -67,7 +67,7 @@
 GameList Engine_SWORD2_gameList() {
 	const Sword2GameSettings *g = sword2_settings;
 	GameList games;
-	while (g->name) {
+	while (g->gameid) {
 		games.push_back(g->toGameSettings());
 		g++;
 	}
@@ -82,7 +82,7 @@
 	// between the 'sword2' and 'sword2demo' targets. The current code
 	// can't do that since they use the same detectname.
 
-	for (g = sword2_settings; g->name; ++g) {
+	for (g = sword2_settings; g->gameid; ++g) {
 		// Iterate over all files in the given directory
 		for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 			if (!file->isDirectory()) {





More information about the Scummvm-git-logs mailing list