[Scummvm-git-logs] scummvm master -> 8f2bd1c879b217f24e390c5323fcd05345b4d546

[bluegr]

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

Summary:
9de50c7902 GOB: Mark all Adi 2 demos as ADGF_DEMO
56a77f5fcc GOB: use AD_ENTRY for Adi 2 demos
8f2bd1c879 GOB: set urban and woodruff as kPlatformWindows


Commit: 9de50c790248084f7f60b738c6adf0f113d22e20
    https://github.com/scummvm/scummvm/commit/9de50c790248084f7f60b738c6adf0f113d22e20
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-01-07T13:51:49+02:00

Commit Message:
GOB: Mark all Adi 2 demos as ADGF_DEMO

Changed paths:
    engines/gob/detection/tables_adi2.h


diff --git a/engines/gob/detection/tables_adi2.h b/engines/gob/detection/tables_adi2.h
index 2315c71817c..66821282bc5 100644
--- a/engines/gob/detection/tables_adi2.h
+++ b/engines/gob/detection/tables_adi2.h
@@ -205,7 +205,7 @@
 		},
 		EN_ANY,
 		kPlatformDOS,
-		ADGF_NO_FLAGS,
+		ADGF_DEMO,
 		GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
@@ -225,7 +225,7 @@
 		},
 		DE_DEU,
 		kPlatformDOS,
-		ADGF_NO_FLAGS,
+		ADGF_DEMO,
 		GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
@@ -244,7 +244,7 @@
 	  	},
 		FR_FRA,
 	  	kPlatformDOS,
-	  	ADGF_NO_FLAGS,
+	  	ADGF_DEMO,
 	  	GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,


Commit: 56a77f5fcc289a775cbb93405a5fad8ffc46803b
    https://github.com/scummvm/scummvm/commit/56a77f5fcc289a775cbb93405a5fad8ffc46803b
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-01-07T13:51:49+02:00

Commit Message:
GOB: use AD_ENTRY for Adi 2 demos

Changed paths:
    engines/gob/detection/tables_adi2.h


diff --git a/engines/gob/detection/tables_adi2.h b/engines/gob/detection/tables_adi2.h
index 66821282bc5..7e835005006 100644
--- a/engines/gob/detection/tables_adi2.h
+++ b/engines/gob/detection/tables_adi2.h
@@ -196,13 +196,10 @@
 	{
 		"adi2",
 		"Non-Interactive Demo",
-		{
-			{"demo.scn", 0, "8b5ba359fd87d586ad39c1754bf6ea35", 168},
-			{"demadi2t.vmd", 0, "08a1b18cfe2015d3b43270da35cc813d", 7250723},
-			{"demarch.vmd", 0, "4c4a4616585d40ef3df209e3c3911062", 5622731},
-			{"demobou.vmd", 0, "2208b9855775564d15c4a5a559da0aec", 3550511},
-			{0, 0, 0, 0}
-		},
+		AD_ENTRY4s("demo.scn", "8b5ba359fd87d586ad39c1754bf6ea35", 168,
+				"demadi2t.vmd",	"08a1b18cfe2015d3b43270da35cc813d", 7250723,
+                "demarch.vmd", "4c4a4616585d40ef3df209e3c3911062", 5622731,
+                "demobou.vmd", "2208b9855775564d15c4a5a559da0aec", 3550511),
 		EN_ANY,
 		kPlatformDOS,
 		ADGF_DEMO,
@@ -216,13 +213,10 @@
 	{
 		"adi2",
 		"Non-Interactive Demo",
-		{
-			{"demo.scn", 0, "16331b4db31b153f241ebcee49b7383d", 170},
-			{"demadi2d.vmd", 0, "658b5502bf0aeb46a39788f6a07e3d97", 7552841},
-			{"demarchd.vmd", 0, "a93184f0e297bb2e1ebfd64c1038e1ae", 5946788},
-			{"demoboud.vmd", 0, "37f3a61852c4485f2cc86b9880b98a6c", 3552135},
-			{0, 0, 0, 0}
-		},
+		AD_ENTRY4s("demo.scn", "16331b4db31b153f241ebcee49b7383d", 170,
+				"demadi2d.vmd",	"658b5502bf0aeb46a39788f6a07e3d97", 7552841,
+                "demoarchd.vmd", "a93184f0e297bb2e1ebfd64c1038e1ae", 5946788,
+                "demoboud.vmd", "37f3a61852c4485f2cc86b9880b98a6c", 3552135),
 		DE_DEU,
 		kPlatformDOS,
 		ADGF_DEMO,
@@ -236,12 +230,9 @@
 	{
 		"adi2",
 		"Non-Interactive Demo",
-		{
-			{"demo.scn", 0, "8b5ba359fd87d586ad39c1754bf6ea35", 168},
-	   		{"demarch.vmd", 0, "4c4a4616585d40ef3df209e3c3911062", 5622731},
-	   		{"demobou.vmd", 0, "2208b9855775564d15c4a5a559da0aec", 3550511},
-	   		{0, 0, 0, 0}
-	  	},
+		AD_ENTRY3s("demo.scn", "8b5ba359fd87d586ad39c1754bf6ea35", 168,
+				"demarch.vmd",	"4c4a4616585d40ef3df209e3c3911062", 5622731,
+                "demobou.vmd", "2208b9855775564d15c4a5a559da0aec", 3550511),
 		FR_FRA,
 	  	kPlatformDOS,
 	  	ADGF_DEMO,


Commit: 8f2bd1c879b217f24e390c5323fcd05345b4d546
    https://github.com/scummvm/scummvm/commit/8f2bd1c879b217f24e390c5323fcd05345b4d546
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-01-07T13:51:49+02:00

Commit Message:
GOB: set urban and woodruff as kPlatformWindows

Changed paths:
    engines/gob/detection/tables_fallback.h


diff --git a/engines/gob/detection/tables_fallback.h b/engines/gob/detection/tables_fallback.h
index fb96e390656..fc6918032e2 100644
--- a/engines/gob/detection/tables_fallback.h
+++ b/engines/gob/detection/tables_fallback.h
@@ -143,7 +143,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			"unknown",
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
-			kPlatformDOS,
+			kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
 		},
@@ -199,7 +199,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			"unknown",
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
-			kPlatformDOS,
+			kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
 		},