thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added default game id for config file support: 'gameid' in 'residual' section

Browse source
This commit is contained in:
Pawel Kolodziejski 2009-05-27 10:03:49 +00:00
parent 552f6022be
commit f34aeea960
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/commandLine.cpp
View file

@ -417,13 +417,15 @@ bool processSettings(Common::String &command, Common::StringMap &settings) {
#endif // DISABLE_COMMAND_LINE #endif // DISABLE_COMMAND_LINE
Common::String gameId;
if (command.empty())
gameId = ConfMan.get("gameid", Common::ConfigManager::kApplicationDomain);
else
gameId = command;
// If a target was specified, check whether there is either a game if (!gameId.empty()) {
// domain (i.e. a target) matching this argument, or alternatively GameDescriptor gd = EngineMan.findGame(gameId);
// whether there is a gameid matching that name. if (ConfMan.hasGameDomain(gameId) || !gd.gameid().empty()) {
if (!command.empty()) {
GameDescriptor gd = EngineMan.findGame(command);
if (ConfMan.hasGameDomain(command) || !gd.gameid().empty()) {
bool idCameFromCommandLine = false; bool idCameFromCommandLine = false;
// WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching // WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching
@ -432,11 +434,11 @@ bool processSettings(Common::String &command, Common::StringMap &settings) {
// We designate gameids which come strictly from command line // We designate gameids which come strictly from command line
// so AdvancedDetector will not save config file with invalid // so AdvancedDetector will not save config file with invalid
// gameid in case target autoupgrade was performed // gameid in case target autoupgrade was performed
if (!ConfMan.hasGameDomain(command)) { if (!ConfMan.hasGameDomain(gameId)) {
idCameFromCommandLine = true; idCameFromCommandLine = true;
} }
ConfMan.setActiveDomain(command); ConfMan.setActiveDomain(gameId);
if (idCameFromCommandLine) if (idCameFromCommandLine)
ConfMan.set("id_came_from_command_line", "1"); ConfMan.set("id_came_from_command_line", "1");