[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.131,1.132
Max Horn
fingolfin at users.sourceforge.net
Sat Jan 21 05:03:01 CET 2006
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/gui
Modified Files:
launcher.cpp
Log Message:
Fix various incorrect usages of the word 'target' instead of 'gameid'; change the ambigiuous 'GameSettings::name' to 'GameSettings::gameid'
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- launcher.cpp 18 Jan 2006 17:39:36 -0000 1.131
+++ launcher.cpp 21 Jan 2006 13:01:18 -0000 1.132
@@ -594,18 +594,18 @@
const ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
ConfigManager::DomainMap::const_iterator iter = domains.begin();
for (iter = domains.begin(); iter != domains.end(); ++iter) {
- String name(iter->_value.get("gameid"));
+ String gameid(iter->_value.get("gameid"));
String description(iter->_value.get("description"));
- if (name.isEmpty())
- name = iter->_key;
+ if (gameid.isEmpty())
+ gameid = iter->_key;
if (description.isEmpty()) {
- GameSettings g = GameDetector::findGame(name);
+ GameSettings g = GameDetector::findGame(gameid);
if (g.description)
description = g.description;
}
- if (!name.isEmpty() && !description.isEmpty()) {
+ if (!gameid.isEmpty() && !description.isEmpty()) {
// Insert the game into the launcher list
int pos = 0, size = l.size();
@@ -669,7 +669,7 @@
// The auto detector or the user made a choice.
// Pick a domain name which does not yet exist (after all, we
// are *adding* a game to the config, not replacing).
- String domain(result.name);
+ String domain(result.gameid);
if (ConfMan.hasGameDomain(domain)) {
char suffix = 'a';
domain += suffix;
@@ -679,7 +679,7 @@
suffix++;
domain += suffix;
}
- ConfMan.set("gameid", result.name, domain);
+ ConfMan.set("gameid", result.gameid, domain);
ConfMan.set("description", result.description, domain);
}
ConfMan.set("path", dir.path(), domain);
More information about the Scummvm-git-logs
mailing list