[Scummvm-git-logs] scummvm master -> 1e2e01eed93af09b091df457aa7d1446cf3ebc57

[bluegr]

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

Summary:
5939e4bf18 WINTERMUTE: Reorder Carol Reed detection records
1e2e01eed9 WINTERMUTE: Add detection for 6 more Carol Reed demos


Commit: 5939e4bf182817e44150deb529ecff2481076f4c
    https://github.com/scummvm/scummvm/commit/5939e4bf182817e44150deb529ecff2481076f4c
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2019-07-02T07:57:39+03:00

Commit Message:
WINTERMUTE: Reorder Carol Reed detection records

On undetected game user gets message like this:
```
Matched game IDs for the Wintermute engine: actualdest-win,
basisoctavus-win-cz,
agustin-win, bthreshold-win, bickadoodle-win, bookofgron-win-ru,
carolreed4-demo-win, carolreed5-win, carolreed6-win,
carolreed7-demo-win,
carolreed8-win, carolreed9-win, carolreed10-win, carolreed11-win,
carolreed12-win, carolreed13-win, carolreed14-win, chivalry-win,
corrosion-win,
deadcity-win-cz, dfafadventure-win, dirtysplit-win, dreaming-win,
driller-win,
...
```
It's confusing that some carolreed games are mentioned as demos and some
are not.
Fixed this by reordering them.

Changed paths:
    engines/wintermute/detection_tables.h


diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 0bc2308..dee7a98 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -242,10 +242,6 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("bookofgron", "",
 		WME_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 
-	// Carol Reed 4 - East Side Story (Demo)
-	WME_WINENTRY("carolreed4", "Demo",
-		WME_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
-
 	// Carol Reed 4 - East Side Story (English)
 	WME_WINENTRY("carolreed4", "",
 		WME_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
@@ -254,6 +250,10 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("carolreed4", "",
 		WME_ENTRY1s("data.dcp", "549e6fb7afebcc4a8092e3898a5c5cc3", 618787625), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 4 - East Side Story (Demo)
+	WME_WINENTRY("carolreed4", "Demo",
+		WME_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 5 - The Colour of Murder
 	WME_WINENTRY("carolreed5", "",
 		WME_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
@@ -266,14 +266,14 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("carolreed6", "",
 		WME_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
-	// Carol Reed 7 - Blue Madonna (Demo)
-	WME_WINENTRY("carolreed7", "Demo",
-		WME_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
-
 	// Carol Reed 7 - Blue Madonna
 	WME_WINENTRY("carolreed7", "",
 		WME_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 7 - Blue Madonna (Demo)
+	WME_WINENTRY("carolreed7", "Demo",
+		WME_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 8 - Amber's Blood
 	WME_WINENTRY("carolreed8", "",
 		WME_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),


Commit: 1e2e01eed93af09b091df457aa7d1446cf3ebc57
    https://github.com/scummvm/scummvm/commit/1e2e01eed93af09b091df457aa7d1446cf3ebc57
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2019-07-02T07:57:39+03:00

Commit Message:
WINTERMUTE: Add detection for 6 more Carol Reed demos

Also fixes https://bugs.scummvm.org/ticket/11005

Changed paths:
    engines/wintermute/detection_tables.h


diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index dee7a98..217607a 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -266,6 +266,10 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("carolreed6", "",
 		WME_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 6 - Black Circle (Demo)
+	WME_WINENTRY("carolreed6", "Demo",
+		WME_ENTRY1s("data.dcp", "e18bc4adc843e6dcf08cc20be00d1608", 94399373), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 7 - Blue Madonna
 	WME_WINENTRY("carolreed7", "",
 		WME_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
@@ -278,18 +282,38 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("carolreed8", "",
 		WME_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 8 - Amber's Blood (Demo)
+	WME_WINENTRY("carolreed8", "Demo",
+		WME_ENTRY1s("data.dcp", "e8c6b6e5d2e79bc87bf591f47202c233", 110106328), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 9 - Cold Case Summer
 	WME_WINENTRY("carolreed9", "",
 		WME_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 9 - Cold Case Summer (Demo)
+	WME_WINENTRY("carolreed9", "Demo",
+		WME_ENTRY1s("data.dcp", "b3312b0b9f209a9a01b2ba9135829640", 86362217), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 10 - Bosch's Damnation
 	WME_WINENTRY("carolreed10", "",
 		WME_ENTRY1s("data.dcp", "5c698e28fe10854ea52964e3768e50e4", 588439599), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 10 - Bosch's Damnation (Demo)
+	WME_WINENTRY("carolreed10", "Demo",
+		WME_ENTRY1s("data.dcp", "72b29cb3f0bc83efa6e3bae41b4e899a", 79971080), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 11 - Shades Of Black
 	WME_WINENTRY("carolreed11", "",
 		WME_ENTRY1s("data.dcp", "a1e9f54b48493e9c6d737e3a94779d8c", 525450069), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 
+	// Carol Reed 11 - Shades Of Black (Demo)
+	WME_WINENTRY("carolreed11", "Demo",
+		WME_ENTRY1s("data.dcp", "8c27236d29747b6bb6a0a563fb769f20", 52692061), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
+	// Carol Reed 11 - Shades Of Black (HD Demo)
+	WME_WINENTRY("carolreed11", "HD Demo",
+		WME_ENTRY1s("data.dcp", "ba124af0a0ee3113f3f9dc0c1159ec26", 77909344), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+
 	// Carol Reed 12 - Profound Red
 	WME_WINENTRY("carolreed12", "",
 		WME_ENTRY1s("data.dcp", "edc1e69dc52ec2a65fa431a51c783c2e", 944403699), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),