[Scummvm-cvs-logs] SF.net SVN: scummvm: [25541] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 25541
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25541&view=rev
Author:   fingolfin
Date:     2007-02-13 05:00:18 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Use GF_DEMO flag in the AdvancedDetector to augment the preferredtarget name

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/engines/gob/detection.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2007-02-13 12:14:27 UTC (rev 25540)
+++ scummvm/trunk/common/advancedDetector.cpp	2007-02-13 13:00:18 UTC (rev 25541)
@@ -166,6 +166,10 @@
 static String generateComplexID(const String &id, const ADGameDescription *desc) {
 	String res(id);
 
+	if (desc->flags & GF_DEMO) {
+		res = res + "-demo";
+	}
+
 	if (desc->platform != kPlatformPC && desc->platform != kPlatformUnknown) {
 		res = res + "-" + getPlatformAbbrev(desc->platform);
 	}

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2007-02-13 12:14:27 UTC (rev 25540)
+++ scummvm/trunk/engines/gob/detection.cpp	2007-02-13 13:00:18 UTC (rev 25541)
@@ -46,16 +46,12 @@
 	{"gob", "Gob engine game"},
 	{"gob1", "Gobliiins"},
 	{"gob1cd", "Gobliiins CD"},
-	{"gob1-demo", "Gobliiins Demo"},
 	{"gob2", "Gobliins 2"},
 	{"gob2cd", "Gobliins 2 CD"},
-	{"gob2-demo", "Gobliins 2 Demo"},
 	{"gob3", "Goblins Quest 3"},
 	{"gob3cd", "Goblins Quest 3 CD"},
-	{"gob3-demo", "Goblins Quest 3 Demo"},
 	{"bargon", "Bargon Attack"},
 	{"ween", "Ween: The Prophecy"},
-	{"ween-demo", "Ween: The Prophecy Demo"},
 	{"woodruff", "The Bizarre Adventures of Woodruff and the Schnibble"},
 	{0, 0}
 };
@@ -251,7 +247,7 @@
 	},
 	{
 		{
-			"gob1-demo",
+			"gob1",
 			"Demo",
 			AD_ENTRY1("intro.stk", "972f22c6ff8144a6636423f0354ca549"),
 			UNK_LANG,
@@ -263,7 +259,7 @@
 	},
 	{
 		{
-			"gob1-demo",
+			"gob1",
 			"Interactive Demo",
 			AD_ENTRY1("intro.stk", "e72bd1e3828c7dec4c8a3e58c48bdfdb"),
 			UNK_LANG,
@@ -531,8 +527,8 @@
 	},
 	{
 		{
-			"gob2-demo",
-			"Non-Interactive",
+			"gob2",
+			"Non-Interactive Demo",
 			AD_ENTRY1("intro.stk", "8b1c98ff2ab2e14f47a1b891e9b92217"),
 			UNK_LANG,
 			kPlatformPC,
@@ -543,8 +539,8 @@
 	},
 	{
 		{
-			"gob2-demo",
-			"Interactive",
+			"gob2",
+			"Interactive Demo",
 			AD_ENTRY1("intro.stk", "cf1c95b2939bd8ff58a25c756cb6125e"),
 			UNK_LANG,
 			kPlatformPC,
@@ -555,8 +551,8 @@
 	},
 	{
 		{
-			"gob2-demo",
-			"Interactive",
+			"gob2",
+			"Interactive Demo",
 			AD_ENTRY1("intro.stk", "4b278c2678ea01383fd5ca114d947eea"),
 			UNK_LANG,
 			kPlatformPC,
@@ -675,8 +671,8 @@
 	},
 	{
 		{
-			"ween-demo",
-			"",
+			"ween",
+			"Demo",
 			AD_ENTRY1("intro.stk", "2e9c2898f6bf206ede801e3b2e7ee428"),
 			UNK_LANG,
 			kPlatformPC,
@@ -687,8 +683,8 @@
 	},
 	{
 		{
-			"ween-demo",
-			"",
+			"ween",
+			"Demo",
 			AD_ENTRY1("intro.stk", "15fb91a1b9b09684b28ac75edf66e504"),
 			EN_USA,
 			kPlatformPC,
@@ -819,8 +815,8 @@
 	},
 	{
 		{
-			"gob3-demo",
-			"Interactive",
+			"gob3",
+			"Interactive Demo",
 			AD_ENTRY1("intro.stk", "7aebd94e49c2c5c518c9e7b74f25de9d"),
 			UNK_LANG,
 			kPlatformPC,
@@ -831,8 +827,8 @@
 	},
 	{
 		{
-			"gob3-demo",
-			"Non-interactive",
+			"gob3",
+			"Non-interactive Demo",
 			AD_ENTRY1("intro.stk", "b9b898fccebe02b69c086052d5024a55"),
 			UNK_LANG,
 			kPlatformPC,
@@ -843,7 +839,7 @@
 	},
 	{
 		{
-			"gob3-demo",
+			"gob3",
 			"Interactive Demo 2",
 			AD_ENTRY1("intro.stk", "e5dcbc9f6658ebb1e8fe26bc4da0806d"),
 			UNK_LANG,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.