- Reverted the *vga targets back to *sci, and used the extras field again for VGA remakes

- The extras field is now filled by the fallback detector for VGA games

svn-id: r43893

3 files changed, 10 insertions, 10 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 25f6214d12..28d8ee5274 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -62,8 +62,8 @@ static const OldNewIdTableEntry s_oldNewTable[] = {
 	{ "demo000",	"kq1sci",			true },
 	{ "kq1",		"kq1sci",			false },
 	{ "kq4",		"kq4sci",			false },
-	{ "ll1",		"lsl1vga",			true },
-	{ "lsl1",		"lsl1vga",			false },
+	{ "ll1",		"lsl1sci",			true },
+	{ "lsl1",		"lsl1sci",			false },
 	// lsl2 is the same
 	{ "ll5",		"lsl5",				true },
 	// lsl5 is the same
@@ -76,8 +76,8 @@ static const OldNewIdTableEntry s_oldNewTable[] = {
 	{ "trial",		"qfg2",				false },
 	{ "hq2demo",	"qfg2",				true },
 	{ "thegame",	"slater",			false },
-	{ "sq1demo",	"sq1vga",			true },
-	{ "sq1",		"sq1vga",			false },
+	{ "sq1demo",	"sq1sci",			true },
+	{ "sq1",		"sq1sci",			false },
 	// sq5 is the same
 
 	{ 0, 0, 0 }
@@ -131,7 +131,7 @@ const char *convertSierraGameId(const char *gameName, uint32 *gameFlags) {
 			*gameFlags |= ADGF_DEMO;
 		return "fairytales";
 	}
-	// TODO: pq1vga (its resources can't be read)
+	// TODO: pq1sci (its resources can't be read)
 	if (sierraId == "pq3") {
 		// The pq3 demo comes with resource.000 and resource.001
 		// The full version was released with several resource.* files,
@@ -149,7 +149,7 @@ const char *convertSierraGameId(const char *gameName, uint32 *gameFlags) {
 		else if (Common::File::exists("resource.sfx"))
 			return "qfg4";
 		else
-			return (Common::File::exists("resource.001")) ? "qfg1" : "qfg1vga";
+			return "qfg1";
 	}
 	if (sierraId == "sq3") {
 		// Both SQ3 and the separately released subgame, Astro Chicken,
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index bf0b29a127..4f4924d3ec 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -51,7 +51,7 @@ enum {
  *
  * To handle opening a file called "foobar", what we do is this: First, we
  * create an 'augmented file name', by prepending the game target and a dash,
- * so if we running game target sq1vga, the name becomes "sq1vga-foobar".
+ * so if we running game target sq1sci, the name becomes "sq1sci-foobar".
  * Next, we check if such a file is known to the SaveFileManager. If so, we
  * we use that for reading/writing, delete it, whatever.
  *
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 3f1d2e5ef0..064967b0e9 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1234,12 +1234,12 @@ static Polygon *convert_polygon(EngineState *s, reg_t polygon) {
 	Polygon *poly = new Polygon(GET_SEL32(polygon, type).toUint16());
 	int is_reg_t = polygon_is_reg_t(list, size);
 
-	// WORKAROUND: broken polygon in LSL1VGA, room 350, after opening elevator
+	// WORKAROUND: broken polygon in lsl1sci, room 350, after opening elevator
 	// Polygon has 17 points but size is set to 19
-	if ((size == 19) && (s->_gameName == "lsl1vga")) {
+	if ((size == 19) && (s->_gameName == "lsl1sci")) {
 		if ((s->currentRoomNumber() == 350)
 		&& (read_point(list, is_reg_t, 18) == Common::Point(108, 137))) {
-			debug(1, "Applying fix for broken polygon in LSL1VGA, room 350");
+			debug(1, "Applying fix for broken polygon in lsl1sci, room 350");
 			size = 17;
 		}
 	}