[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.128,1.129
Max Horn
fingolfin at users.sourceforge.net
Sat Jan 21 05:03:02 CET 2006
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/kyra
Modified Files:
kyra.cpp
Log Message:
Fix various incorrect usages of the word 'target' instead of 'gameid'; change the ambigiuous 'GameSettings::name' to 'GameSettings::gameid'
Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- kyra.cpp 19 Jan 2006 23:11:16 -0000 1.128
+++ kyra.cpp 21 Jan 2006 13:01:18 -0000 1.129
@@ -58,14 +58,14 @@
// Kyra MD5 detection brutally ripped from the Gobliins engine.
struct KyraGameSettings {
- const char *name;
+ const char *gameid;
const char *description;
byte id;
uint32 features;
const char *md5sum;
const char *checkFile;
GameSettings toGameSettings() const {
- GameSettings dummy = { name, description, features };
+ GameSettings dummy = { gameid, description, features };
return dummy;
}
};
@@ -96,11 +96,11 @@
// Keep list of different supported games
struct KyraGameList {
- 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;
}
};
@@ -114,7 +114,7 @@
GameList games;
const KyraGameList *g = kyra_list;
- while (g->name) {
+ while (g->gameid) {
games.push_back(g->toGameSettings());
g++;
}
@@ -132,7 +132,7 @@
if (file->isDirectory())
continue;
- for (g = kyra_games; g->name; g++) {
+ for (g = kyra_games; g->gameid; g++) {
if (scumm_stricmp(file->displayName().c_str(), g->checkFile) == 0)
isFound = true;
}
@@ -150,7 +150,7 @@
for (int i = 0; i < 16; i++) {
sprintf(md5str + i * 2, "%02x", (int)md5sum[i]);
}
- for (g = kyra_games; g->name; g++) {
+ for (g = kyra_games; g->gameid; g++) {
if (strcmp(g->md5sum, (char *)md5str) == 0) {
detectedGames.push_back(g->toGameSettings());
}
@@ -159,7 +159,7 @@
debug("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5str);
const KyraGameList *g1 = kyra_list;
- while (g1->name) {
+ while (g1->gameid) {
detectedGames.push_back(g1->toGameSettings());
g1++;
}
@@ -225,7 +225,7 @@
// data contents
_features = 0;
- for (g = kyra_games; g->name; g++) {
+ for (g = kyra_games; g->gameid; g++) {
if (!Common::File::exists(g->checkFile))
continue;
More information about the Scummvm-git-logs
mailing list