[Scummvm-cvs-logs] scummvm master -> cf4cea4872d9725b5c282e1580706c93479d58d9

sev- sev at scummvm.org
Mon Mar 7 19:00:52 CET 2016


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0463b787e1 AD: Added new flag for autogenerating game target from extra information
60f60f87c3 WAGE: Added couple more games to detection
fea0fc9ff3 WAGE: Use new AD flag for autogenerating targets for fangames
cf4cea4872 WAGE: Added games from Joshua's Worlds 1.0


Commit: 0463b787e1355f416a5d133dfae443928181ca83
    https://github.com/scummvm/scummvm/commit/0463b787e1355f416a5d133dfae443928181ca83
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-07T19:00:37+01:00

Commit Message:
AD: Added new flag for autogenerating game target from extra information

Changed paths:
    engines/advancedDetector.cpp
    engines/advancedDetector.h



diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 72629a8..aa76e6c 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -89,6 +89,18 @@ static Common::String generatePreferredTarget(const Common::String &id, const AD
 	return res;
 }
 
+static Common::String sanitizeName(const char *name) {
+	Common::String res;
+
+	while (*name) {
+		if (Common::isAlnum(*name))
+			res += tolower(*name);
+		name++;
+	}
+
+	return res;
+}
+
 void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const {
 	if (_singleid != NULL) {
 		desc["preferredtarget"] = desc["gameid"];
@@ -96,7 +108,15 @@ void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGame
 	}
 
 	if (!desc.contains("preferredtarget"))
-		desc["preferredtarget"] = desc["gameid"];
+			desc["preferredtarget"] = desc["gameid"];
+
+	if (realDesc->flags & ADGF_AUTOGENTARGET) {
+		warning("Ahem");
+		if (*realDesc->extra)
+			desc["preferredtarget"] = sanitizeName(realDesc->extra);
+	}
+
+	warning("here: %s", desc["preferredtarget"].c_str());
 
 	desc["preferredtarget"] = generatePreferredTarget(desc["preferredtarget"], realDesc);
 
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index ad55169..ba1aa02 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -81,6 +81,7 @@ typedef Common::HashMap<Common::String, ADFileProperties, Common::IgnoreCase_Has
 
 enum ADGameFlags {
 	ADGF_NO_FLAGS = 0,
+	ADGF_AUTOGENTARGET = (1 << 20),  // automatically generate gameid from extra
 	ADGF_UNSTABLE = (1 << 21),    	// flag to designate not yet officially-supported games that are not fit for public testing
 	ADGF_TESTING = (1 << 22),    	// flag to designate not yet officially-supported games that are fit for public testing
 	ADGF_PIRATED = (1 << 23), ///< flag to designate well known pirated versions with cracks


Commit: 60f60f87c3107676c49ea230a8c9c778e3a9e1c0
    https://github.com/scummvm/scummvm/commit/60f60f87c3107676c49ea230a8c9c778e3a9e1c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-07T19:00:37+01:00

Commit Message:
WAGE: Added couple more games to detection

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 41573fa..4a26eed 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -44,6 +44,8 @@ static const ADGameDescription gameDescriptions[] = {
 	// Polygons with ignored byte 1
 	FANGAME("Double Trouble", "5e9ee13d09ac54918ed111fa9727ac1c", 557184),
 	FANGAME("Eidisi I", "299d1de4baccf1c66118396519953652", 180480),
+	// Problems(?) with text on the first screen
+	FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "35514583fe7ab36fad2569fc87bd887b", 414464),
 	FANGAME("Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
 	FANGAME("Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
 	// Crash in console rendering on the first scene
@@ -51,6 +53,7 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Lost Crystal", "4f21ba8ee64f8d655b9eeb1e3ffd50f7", 792064),
 	FANGAME("Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
 	FANGAME("Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
+	FANGAME("Pyramid of No Return", "48a9c668ce69206f57e11e1a85970d02", 392192),
 	FANGAME("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
 	// Crash in console rendering on the initial scene
 	FANGAME("Quest for the Dark Sword", "7e4e712d151f6c686f6024b0dedf5d34", 590720),


Commit: fea0fc9ff3b6efac4928b95fa9abc7029a089c37
    https://github.com/scummvm/scummvm/commit/fea0fc9ff3b6efac4928b95fa9abc7029a089c37
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-07T19:00:37+01:00

Commit Message:
WAGE: Use new AD flag for autogenerating targets for fangames

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 4a26eed..f4f787d 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -23,7 +23,7 @@
 namespace Wage {
 
 #define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM)
-#define ADGF_GENERIC (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_USEEXTRAASTITLE)
+#define ADGF_GENERIC (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_USEEXTRAASTITLE|ADGF_AUTOGENTARGET)
 
 #define FANGAME(n,m,s) { "wage",n,AD_ENTRY1s(n,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_GENERIC,GUIO0()}
 #define FANGAMEN(n,f,m,s) { "wage",n,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_GENERIC,GUIO0()}


Commit: cf4cea4872d9725b5c282e1580706c93479d58d9
    https://github.com/scummvm/scummvm/commit/cf4cea4872d9725b5c282e1580706c93479d58d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-07T19:00:38+01:00

Commit Message:
WAGE: Added games from Joshua's Worlds 1.0

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index f4f787d..fcd03d3 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -50,9 +50,12 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Exploration Zeta!", "b9fbb704017d7ea9613b0160f86527bb", 370944),
 	// Crash in console rendering on the first scene
 	FANGAME("Fantasy Quest", "599f0b2c7ecce65c39646c05f2c19c1b", 782848),
+	FANGAME("Find the Heart", "7ae36ffa295651cd6d2d56981d6b5ff7", 108928), // From Joshua's Worlds 1.0
 	FANGAME("Lost Crystal", "4f21ba8ee64f8d655b9eeb1e3ffd50f7", 792064),
 	FANGAME("Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
 	FANGAME("Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
+	FANGAME("Puzzle Piece Search", "51885fe2effeaa14b2b8b08a53931805", 252928), // From Joshua's Worlds 1.0
+	// Empty(?)  first scene
 	FANGAME("Pyramid of No Return", "48a9c668ce69206f57e11e1a85970d02", 392192),
 	FANGAME("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
 	// Crash in console rendering on the initial scene






More information about the Scummvm-git-logs mailing list