BASE: Change the command line interface to use engine-qualified game names

Qualified game names have the following form: engineId:gameId.
Unqualified game names are still supported as long as they are not
ambiguous. However they are considered deprecated and are no longer
displayed by the --list-games command.

1 files changed, 5 insertions, 9 deletions

diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 4f3c1647a1..1b34a4753d 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -103,15 +103,11 @@ EditGameDialog::EditGameDialog(const String &domain)
 	EngineMan.upgradeTargetIfNecessary(domain);
 
 	// Retrieve all game specific options.
-	const Plugin *plugin = nullptr;
-	// To allow for game domains without a gameid.
-	// TODO: Is it intentional that this is still supported?
-	String gameId(ConfMan.get("gameid", domain));
-	if (gameId.empty())
-		gameId = domain;
+
 	// Retrieve the plugin, since we need to access the engine's MetaEngine
 	// implementation.
-	PlainGameDescriptor pgd = EngineMan.findGame(gameId, &plugin);
+	const Plugin *plugin = nullptr;
+	QualifiedGameDescriptor qgd = EngineMan.findTarget(domain, &plugin);
 	if (plugin) {
 		_engineOptions = plugin->get<MetaEngine>().getExtraGuiOptions(domain);
 	} else {
@@ -125,8 +121,8 @@ EditGameDialog::EditGameDialog(const String &domain)
 
 	// GAME: Determine the description string
 	String description(ConfMan.get("description", domain));
-	if (description.empty() && pgd.description) {
-		description = pgd.description;
+	if (description.empty() && qgd.description) {
+		description = qgd.description;
 	}
 
 	// GUI:  Add tab widget