libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression which prevented to run games specified only in command line

Browse Source 
and not in config file.

svn-id: r25240
This commit is contained in:
Eugene Sandulenko 2007-01-28 01:01:36 +00:00
parent 23a1efe628
commit b8a48f5751
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/commandLine.cpp
View File

@ -647,7 +647,8 @@ bool processSettings(Common::String &command, Common::StringMap &settings) {
// domain (i.e. a target) matching this argument, or alternatively
// whether there is a gameid matching that name.
if (!command.empty()) {
if (ConfMan.hasGameDomain(command) || Base::findGame(command)["gameid"].size() > 0) {
GameDescriptor gd = Base::findGame(command);
if (ConfMan.hasGameDomain(command) || (gd.contains("gameid") && !gd.gameid().empty())) {
ConfMan.setActiveDomain(command);
} else {
usage("Unrecognized game target '%s'", command.c_str());

2
base/game.cpp
View File

@ -68,7 +68,7 @@ GameDescriptor findGame(const Common::String &gameName, const Plugin **plugin) {
PluginList::const_iterator iter = plugins.begin();
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
result = (*iter)->findGame(gameName.c_str());
if (!result.gameid().empty()) {
if (result.contains("gameid") && !result["gameid"].empty()) {
if (plugin)
*plugin = *iter;
break;