SCI: Some changes to the naming scheme of some games

- For remakes like KQ1, KQ4 and LSL1, the "SCI remake" bit has been moved to the game
description (as it's part of the description, not the extras)
- The "VGA" bit has been removed from the extras. Only the "EGA" bit remains for EGA
versions, to distinguish them from their VGA counterparts, when they exist

svn-id: r55115

1 files changed, 11 insertions, 16 deletions

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index a4914e57b4..aeb4b385c6 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -52,17 +52,17 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	{"funseeker",       "Fun Seeker's Guide"},
 	{"hoyle1",          "Hoyle Official Book of Games: Volume 1"},
 	{"hoyle2",          "Hoyle Official Book of Games: Volume 2"},
-	{"kq4sci",          "King's Quest IV: The Perils of Rosella, SCI Remake"},
+	{"kq4sci",          "King's Quest IV: The Perils of Rosella, SCI Remake"},	// Note: There was also an AGI version of this
 	{"laurabow",        "Laura Bow: The Colonel's Bequest"},
 	{"lsl2",            "Leisure Suit Larry 2: Goes Looking for Love (in Several Wrong Places)"},
 	{"lsl3",            "Leisure Suit Larry 3: Passionate Patti in Pursuit of the Pulsating Pectorals"},
 	{"mothergoose",     "Mixed-Up Mother Goose"},
 	{"pq2",             "Police Quest II: The Vengeance"},
-	{"qfg1",            "Quest for Glory I: So You Want to Be a Hero"},
+	{"qfg1",            "Quest for Glory I: So You Want to Be a Hero"},	// Note: There was also a SCI11 VGA remake of this (further down)
 	{"sq3",             "Space Quest III: The Pirates of Pestulon"},
 	// === SCI01 games ========================================================
 	{"qfg2",            "Quest for Glory II: Trial by Fire"},
-	{"kq1sci",          "King's Quest I: Quest for the Crown, SCI Remake"},
+	{"kq1sci",          "King's Quest I: Quest for the Crown, SCI Remake"},	// Note: There was also an AGI version of this
 	// === SCI1 games =========================================================
 	{"castlebrain",     "Castle of Dr. Brain"},
 	{"christmas1990",   "Christmas Card 1990: The Seasoned Professional"},
@@ -81,9 +81,9 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	{"lsl5",            "Leisure Suit Larry 5: Passionate Patti Does a Little Undercover Work"},
 	{"mothergoose256",  "Mixed-Up Mother Goose"},
 	{"msastrochicken",  "Ms. Astro Chicken"},
-	{"pq1sci",          "Police Quest: In Pursuit of the Death Angel"},
+	{"pq1sci",          "Police Quest: In Pursuit of the Death Angel, SCI Remake"},	// Note: There was also an AGI version of this
 	{"pq3",             "Police Quest III: The Kindred"},
-	{"sq1sci",          "Space Quest I: The Sarien Encounter"},
+	{"sq1sci",          "Space Quest I: The Sarien Encounter, SCI Remake"},	// Note: There was also an AGI version of this
 	{"sq4",             "Space Quest IV: Roger Wilco and the Time Rippers"},	// floppy is SCI1, CD SCI1.1
 	// === SCI1.1 games =======================================================
 	{"christmas1992",   "Christmas Card 1992"},
@@ -92,7 +92,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	{"hoyle4",          "Hoyle Classic Card Games"},
 	{"kq6",             "King's Quest VI: Heir Today, Gone Tomorrow"},
 	{"laurabow2",       "Laura Bow 2: The Dagger of Amon Ra"},
-	{"qfg1vga",         "Quest for Glory I: So You Want to Be a Hero"},
+	{"qfg1vga",         "Quest for Glory I: So You Want to Be a Hero, VGA Remake"},	// Note: There was also a SCI0 version of this (further up)
 	{"qfg3",            "Quest for Glory III: Wages of War"},
 	{"sq5",             "Space Quest V: The Next Mutation"},
 	{"islandbrain",     "The Island of Dr. Brain"},
@@ -536,10 +536,6 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl
 		return 0;
 	}
 
-	// EGA views
-	if (gameViews == kViewEga && s_fallbackDesc.platform != Common::kPlatformAmiga)
-		s_fallbackDesc.extra = "EGA";
-
 	// Set the platform to Amiga if the game is using Amiga views
 	if (gameViews == kViewAmiga)
 		s_fallbackDesc.platform = Common::kPlatformAmiga;
@@ -590,12 +586,11 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl
 
 	// Fill in extras field
 	if (!strcmp(s_fallbackDesc.gameid, "lsl1sci") ||
-		!strcmp(s_fallbackDesc.gameid, "pq1sci") ||
-		!strcmp(s_fallbackDesc.gameid, "sq1sci"))
-		s_fallbackDesc.extra = "VGA Remake";
-
-	if (!strcmp(s_fallbackDesc.gameid, "qfg1vga") && getSciVersion() == SCI_VERSION_1_1)
-		s_fallbackDesc.extra = "VGA Remake";
+		!strcmp(s_fallbackDesc.gameid, "sq1sci")) {
+		// Differentiate EGA versions from the VGA ones, where needed
+		if (gameViews == kViewEga && s_fallbackDesc.platform != Common::kPlatformAmiga)
+			s_fallbackDesc.extra = "EGA";
+	}
 
 	// Add "demo" to the description for demos
 	if (s_fallbackDesc.flags & ADGF_DEMO)