[Scummvm-cvs-logs] SF.net SVN: scummvm:[43893] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Sep 1 21:40:29 CEST 2009
Revision: 43893
http://scummvm.svn.sourceforge.net/scummvm/?rev=43893&view=rev
Author: thebluegr
Date: 2009-09-01 19:40:29 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
- 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
Modified Paths:
--------------
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/detection_tables.h
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kfile.cpp
scummvm/trunk/engines/sci/engine/kpathing.cpp
scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/detection.cpp 2009-09-01 19:40:29 UTC (rev 43893)
@@ -67,7 +67,7 @@
{"kq6", "King's Quest VI: Heir Today, Gone Tomorrow"},
{"laurabow", "Laura Bow: The Colonel's Bequest"},
{"laurabow2", "Laura Bow 2: The Dagger of Amon Ra"},
- {"lsl1vga", "Leisure Suit Larry in the Land of the Lounge Lizards, VGA Remake"},
+ {"lsl1sci", "Leisure Suit Larry in the Land of the Lounge Lizards"},
{"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"},
{"lsl5", "Leisure Suit Larry 5: Passionate Patti Does a Little Undercover Work"},
@@ -76,15 +76,14 @@
{"mothergoose", "Mixed-Up Mother Goose"},
{"msastrochicken", "Ms. Astro Chicken"},
{"pepper", "Pepper's Adventure in Time"},
- {"pq1vga", "Police Quest: In Pursuit of the Death Angel, VGA Remake"},
+ {"pq1sci", "Police Quest: In Pursuit of the Death Angel"},
{"pq2", "Police Quest II: The Vengeance"},
{"pq3", "Police Quest III: The Kindred"},
{"qfg1", "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"},
{"qfg2", "Quest for Glory II: Trial by Fire"},
{"qfg3", "Quest for Glory III: Wages of War"},
{"slater", "Slater & Charlie Go Camping"},
- {"sq1vga", "Space Quest I: The Sarien Encounter, VGA Remake"},
+ {"sq1sci", "Space Quest I: The Sarien Encounter"},
{"sq3", "Space Quest III: The Pirates of Pestulon"},
{"sq4", "Space Quest IV: Roger Wilco and the Time Rippers"},
{"sq5", "Space Quest V: The Next Mutation"},
@@ -353,6 +352,15 @@
if (!strcmp(s_fallbackDesc.desc.gameid, "kq6") && smallResource000Size)
s_fallbackDesc.desc.flags |= ADGF_DEMO;
+ // Fill in extras field
+ if (!strcmp(s_fallbackDesc.desc.gameid, "lsl1sci") ||
+ !strcmp(s_fallbackDesc.desc.gameid, "pq1sci") ||
+ !strcmp(s_fallbackDesc.desc.gameid, "sq1sci"))
+ s_fallbackDesc.desc.extra = "VGA Remake";
+
+ if (!strcmp(s_fallbackDesc.desc.gameid, "qfg1") && !Common::File::exists("resource.001"))
+ s_fallbackDesc.desc.extra = "VGA Remake";
+
SearchMan.remove("SCI_detection");
return (const ADGameDescription *)&s_fallbackDesc;
Modified: scummvm/trunk/engines/sci/detection_tables.h
===================================================================
--- scummvm/trunk/engines/sci/detection_tables.h 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/detection_tables.h 2009-09-01 19:40:29 UTC (rev 43893)
@@ -1248,7 +1248,7 @@
// Larry 1 EGA Remake - English DOS (from spookypeanut)
// SCI interpreter version 0.000.510 (or 0.000.577?)
- {{"lsl1vga", "EGA Remake", {
+ {{"lsl1sci", "EGA Remake", {
{"resource.map", 0, "abc0dc50c55de5b9723bb6de193f8756", 3282},
{"resource.000", 0, "d3bceaebef3f7be941c2038b3565161e", 451366},
{"resource.001", 0, "38936d3c68b6f79d3ffb13955713fed7", 591352},
@@ -1261,7 +1261,7 @@
// Larry 1 VGA Remake - English Amiga (from www.back2roots.org)
// Executable scanning reports "1.004.024"
// SCI interpreter version 1.000.784
- {{"lsl1vga", "", {
+ {{"lsl1sci", "VGA Remake", {
{"resource.map", 0, "7d115a9e27dc8ac71e8d5ef33d589bd5", 3366},
{"resource.000", 0, "e67fd129d5810fc7ad8ea509d891cc00", 363073},
{"resource.001", 0, "24ed6dc01b1e7fbc66c3d63a5994549a", 750465},
@@ -1273,7 +1273,7 @@
// Larry 1 VGA Remake - English DOS (from spookypeanut)
// Executable scanning reports "1.000.577", VERSION file reports "2.1"
- {{"lsl1vga", "", {
+ {{"lsl1sci", "VGA Remake", {
{"resource.map", 0, "6d04d26466337a1a64b8c6c0eb65c9a9", 3222},
{"resource.000", 0, "d3bceaebef3f7be941c2038b3565161e", 922406},
{"resource.001", 0, "ec20246209d7b19f38989261e5c8f5b8", 1111226},
@@ -1284,7 +1284,7 @@
// Larry 1 VGA Remake - English DOS (from FRG)
// SCI interpreter version 1.000.510
- {{"lsl1vga", "", {
+ {{"lsl1sci", "VGA Remake", {
{"resource.map", 0, "8606b083b011a0cc4a1fbfc2198a0a77", 3198},
{"resource.000", 0, "d3bceaebef3f7be941c2038b3565161e", 918242},
{"resource.001", 0, "d34cadb11e1aefbb497cf91bc1d3baa7", 1114688},
@@ -1295,7 +1295,7 @@
// Larry 1 VGA Remake - English DOS Non-Interactive Demo
// SCI interpreter version 1.000.084
- {{"lsl1vga", "Demo", {
+ {{"lsl1sci", "VGA Remake, Demo", {
{"resource.map", 0, "434e1f6c39d71647b34f0ee57b2bbd68", 444},
{"resource.001", 0, "0c0768215c562d9dace4a5ca53696cf3", 359913},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
@@ -1306,7 +1306,7 @@
// Executable scanning reports "1.SQ4.057", VERSION file reports "1.000"
// This version is known to be corrupted
// SCI interpreter version 1.000.510
- {{"lsl1vga", "", {
+ {{"lsl1sci", "VGA Remake", {
{"resource.map", 0, "4fbe5c25878d51d7b2a68b710de4491b", 3327},
{"resource.000", 0, "5e501a9bf8c753bf4c96158042422f00", 839172},
{"resource.001", 0, "112648995dbc194037f1e4ed2e195910", 1063341},
@@ -1319,7 +1319,7 @@
// Larry 1 VGA Remake - Russian DOS
// Executable scanning reports "1.000.510", VERSION file reports "2.0"
// SCI interpreter version 1.000.510
- {{"lsl1vga", "", {
+ {{"lsl1sci", "VGA Remake", {
{"resource.map", 0, "b54413d35e206d21ae2b2bdb092bd13a", 3198},
{"resource.000", 0, "0d7b2afa666bd36d9535a15d3a837a66", 928566},
{"resource.001", 0, "bc8ca10c807515d959cbd91f9ba47735", 1123759},
@@ -1954,7 +1954,7 @@
// Police Quest 1 VGA Remake - English DOS (from the Police Quest Collection)
// Executable scanning reports "1.001.029", VERSION file reports "2.000"
- {{"pq1vga", "", {
+ {{"pq1sci", "VGA Remake", {
{"resource.map", 0, "35efa814fb994b1cbdac9611e401da67", 5013},
{"resource.000", 0, "e0d5ddf34eda903a38f0837e2aa7145b", 6401433},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
@@ -2229,7 +2229,7 @@
// Quest for Glory 1 VGA Remake - English DOS
// Executable scanning reports "2.000.411"
- {{"qfg1vga", "", {
+ {{"qfg1", "VGA Remake", {
{"resource.map", 0, "a731fb6c9c0b282443f7027bc8694d4c", 8469},
{"resource.000", 0, "ecace1a2771846b1a8aa1afdd44111a0", 6570147},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
@@ -2238,7 +2238,7 @@
// Quest for Glory 1 VGA Remake - English DOS Non-Interactive Demo (from FRG)
// SCI interpreter version 1.001.029
- {{"qfg1vga", "Demo", {
+ {{"qfg1", "VGA Remake, Demo", {
{"resource.map", 0, "ac0257051c95a59c0cdc0be24d9b11fa", 729},
{"resource.000", 0, "ec6f5cf369054dd3e5392995e9975b9e", 768218},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
@@ -2486,7 +2486,7 @@
// Space Quest 1 VGA Remake - English Amiga (from www.back2roots.org)
// SCI interpreter version 1.000.510 (just a guess)
- {{"sq1vga", "", {
+ {{"sq1sci", "VGA Remake", {
{"resource.map", 0, "106484b372af1d4cbf866472cc2813dc", 6396},
{"resource.000", 0, "cc9d6ace343661ae51ec8bd6e6b00a8c", 340944},
{"resource.001", 0, "59efcfa2268d2f8608f544e2674d8151", 761721},
@@ -2501,7 +2501,7 @@
// Space Quest 1 VGA Remake - English DOS (from the Space Quest Collection)
// Executable scanning reports "T.A00.081", VERSION file reports "2.000"
// SCI interpreter version 1.000.510 (just a guess)
- {{"sq1vga", "", {
+ {{"sq1sci", "VGA Remake", {
{"resource.map", 0, "38a74d8f555a2da9ca4f21d14e3c1d33", 5913},
{"resource.000", 0, "e9d866534f8c84de82e25f2631ff258c", 1016436},
{"resource.001", 0, "a89b7b52064c75b1985b289edc2f5c69", 1038757},
@@ -2514,7 +2514,7 @@
// Space Quest 1 VGA Remake - English Non-Interactive Demo (from FRG)
// SCI interpreter version 1.000.181
- {{"sq1vga", "Demo", {
+ {{"sq1sci", "VGA Remake, Demo", {
{"resource.map", 0, "5af709ac5e0e923e0b8174f49978c30e", 636},
{"resource.001", 0, "fd99ea43f57576ded7c86036996346cf", 507642},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
@@ -2524,7 +2524,7 @@
// Space Quest 1 VGA Remake - Spanish DOS Floppy (from jvprat)
// Executable scanning reports "T.A00.081", VERSION file reports "2.000"
// SCI interpreter version 1.000.510 (just a guess)
- {{"sq1vga", "", {
+ {{"sq1sci", "VGA Remake", {
{"resource.map", 0, "cee2a67fa7f8f1f520f398110ca1c37e", 6111},
{"resource.000", 0, "945081a73211e0c40e62f709edcd8d1d", 970657},
{"resource.001", 0, "94692dc84c85c93bb8850f58aebf3cfc", 1085687},
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-09-01 19:40:29 UTC (rev 43893)
@@ -62,8 +62,8 @@
{ "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 @@
{ "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 @@
*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 @@
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,
Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp 2009-09-01 19:40:29 UTC (rev 43893)
@@ -51,7 +51,7 @@
*
* 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.
*
Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp 2009-09-01 19:40:29 UTC (rev 43893)
@@ -1234,12 +1234,12 @@
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;
}
}
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-09-01 19:33:47 UTC (rev 43892)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-09-01 19:40:29 UTC (rev 43893)
@@ -617,7 +617,7 @@
gfx_resource_t *res = NULL;
int hash = getOptionsHash(GFX_RESOURCE_TYPE_FONT);
- // Workaround: LSL1VGA mixes its own internal fonts with the global
+ // Workaround: lsl1sci mixes its own internal fonts with the global
// SCI ones, so we translate them here, by removing their extra bits
if (!resMap.contains(num) && !_resourceManager->testResource(ResourceId(kResourceTypeFont, num)))
num = num & 0x7ff;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list