libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 17:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adv detector: Merged upgradeTargetIfNecessary() into detectGameForEngineCreation()

Browse Source 
svn-id: r27144
This commit is contained in:
Max Horn 2007-06-06 18:35:37 +00:00
parent 5d46606bb0
commit 9e651592ec
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/advancedDetector.cpp
View File

@ -72,27 +72,6 @@ GameList gameIDList(const Common::ADParams &params) {
return GameList(params.list);
}
static void upgradeTargetIfNecessary(const Common::ADParams &params) {
if (params.obsoleteList == 0)
return;
const char *gameid = ConfMan.get("gameid").c_str();
for (const Common::ADObsoleteGameID *o = params.obsoleteList; o->from; ++o) {
if (!scumm_stricmp(gameid, o->from)) {
gameid = o->to;
ConfMan.set("gameid", o->to);
if (o->platform != Common::kPlatformUnknown)
ConfMan.set("platform", Common::getPlatformCode(o->platform));
warning("Target upgraded from %s to %s", o->from, o->to);
ConfMan.flushToDisk();
break;
}
}
}
GameDescriptor findGameID(
const char *gameid,
const Common::ADParams &params
@ -221,10 +200,24 @@ PluginError detectGameForEngineCreation(
const Common::ADParams &params
) {
upgradeTargetIfNecessary(params);
Common::String gameid = ConfMan.get("gameid");
if (params.obsoleteList != 0) {
for (const Common::ADObsoleteGameID *o = params.obsoleteList; o->from; ++o) {
if (!scumm_stricmp(gameid.c_str(), o->from)) {
gameid = o->to;
ConfMan.set("gameid", o->to);
if (o->platform != Common::kPlatformUnknown)
ConfMan.set("platform", Common::getPlatformCode(o->platform));
warning("Target upgraded from %s to %s", o->from, o->to);
ConfMan.flushToDisk();
break;
}
}
}
FSList fslist;
FilesystemNode dir(ConfMan.get("path"));
if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {