[Scummvm-git-logs] scummvm master -> f552a3350a3c87fef43d3690b24ba6bcb3537f7d

elasota noreply at scummvm.org
Sat Aug 17 18:02:40 UTC 2024


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:
73abc786a5 MTROPOLIS: add Chomp demo to detection
f552a3350a MTROPOLIS: add Cloud 9 Sampler to detection


Commit: 73abc786a52d7d3df409cfd579ffba91bce3f2cd
    https://github.com/scummvm/scummvm/commit/73abc786a52d7d3df409cfd579ffba91bce3f2cd
Author: Michael (michael_kuerbis at web.de)
Date: 2024-08-17T14:02:36-04:00

Commit Message:
MTROPOLIS: add Chomp demo to detection

Changed paths:
    engines/mtropolis/boot.cpp
    engines/mtropolis/detection.h
    engines/mtropolis/detection_tables.h


diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index 5b48ec2a8ff..36d7dc537d5 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -1907,9 +1907,14 @@ const Game games[] = {
 		MTBOOT_PURPLEMOON_WIN_EN,
 	 	&BootScriptContext::bootGeneric
 	},
-	// Chomp! The Video Game - Windows - English
+	// Chomp! The Video Game - Retail - Windows - English
 	{
-		MTBOOT_CHOMP_WIN_EN,
+		MTBOOT_CHOMP_RETAIL_WIN_EN,
+	 	&BootScriptContext::bootGeneric
+	},
+	// Chomp! The Video Game - Demo - Windows - English
+	{
+		MTBOOT_CHOMP_DEMO_WIN_EN,
 	 	&BootScriptContext::bootGeneric
 	},
 	// 24 Hours in Cyberspace - Windows - English
diff --git a/engines/mtropolis/detection.h b/engines/mtropolis/detection.h
index d6a497267d7..a4227390303 100644
--- a/engines/mtropolis/detection.h
+++ b/engines/mtropolis/detection.h
@@ -154,7 +154,8 @@ enum MTropolisGameBootID {
 	MTBOOT_DRAWMARVELWAY_WIN_EN,
 	MTBOOT_FTTS_WIN_EN,
 	MTBOOT_PURPLEMOON_WIN_EN,
-	MTBOOT_CHOMP_WIN_EN,
+	MTBOOT_CHOMP_RETAIL_WIN_EN,
+	MTBOOT_CHOMP_DEMO_WIN_EN,
 
 	MTBOOT_CYBER24_WIN_EN,
 	MTBOOT_IVOCLAR_WIN_EN,
diff --git a/engines/mtropolis/detection_tables.h b/engines/mtropolis/detection_tables.h
index 73f16052212..d5287bec166 100644
--- a/engines/mtropolis/detection_tables.h
+++ b/engines/mtropolis/detection_tables.h
@@ -1372,7 +1372,27 @@ static const MTropolisGameDescription gameDescriptions[] = {
 		},
 		GID_CHOMP,
 		0,
-		MTBOOT_CHOMP_WIN_EN,
+		MTBOOT_CHOMP_RETAIL_WIN_EN,
+	},
+
+	{ // Chomp! The Video Game Demo (English, Windows)
+	  // Published by Nabisco, 1996
+		{
+			"chomp",
+			"Demo",
+			{
+				{ "MTPLAY32.EXE", 0, "5bc345c80c615e7c8c633468ba9bd7b4", 681984 },
+				{ "JUMBLE.MPL", 0, "6f1c9e3e83e0eb87506b500b71a6e73c", 6473576 },
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED | ADGF_DEMO,
+			GUIO0()
+		},
+		GID_CHOMP,
+		0,
+		MTBOOT_CHOMP_DEMO_WIN_EN,
 	},
 
 	{ // 24 Hours in Cyberspace (English, Windows)


Commit: f552a3350a3c87fef43d3690b24ba6bcb3537f7d
    https://github.com/scummvm/scummvm/commit/f552a3350a3c87fef43d3690b24ba6bcb3537f7d
Author: Michael (michael_kuerbis at web.de)
Date: 2024-08-17T14:02:36-04:00

Commit Message:
MTROPOLIS: add Cloud 9 Sampler to detection

The demos on the Cloud 9 Sampler disc were mistakenly listed as separate titles,
whereas actually they form a single application with a launcher.

Changed paths:
    engines/mtropolis/boot.cpp
    engines/mtropolis/detection.cpp
    engines/mtropolis/detection.h
    engines/mtropolis/detection_tables.h


diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index 36d7dc537d5..354fda2530b 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -1877,21 +1877,11 @@ const Game games[] = {
 		MTBOOT_IDINO_RETAIL_EN,
 	 	&BootScriptContext::bootGeneric
 	},
-	// I Can Be a Dinosaur Finder - Demo - Windows - English
-	{
-		MTBOOT_IDINO_DEMO_EN,
-	 	&BootScriptContext::bootGeneric
-	},
 	// I Can Be an Animal Doctor - Retail - Windows - English
 	{
 		MTBOOT_IDOCTOR_RETAIL_EN,
 	 	&BootScriptContext::bootGeneric
 	},
-	// I Can Be an Animal Doctor - Demo - Windows - English
-	{
-		MTBOOT_IDOCTOR_DEMO_EN,
-	 	&BootScriptContext::bootGeneric
-	},
 	// How to Draw the Marvel Way - Windows - English
 	{
 		MTBOOT_DRAWMARVELWAY_WIN_EN,
@@ -2062,6 +2052,11 @@ const Game games[] = {
 		MTBOOT_WT_EXTREME_WIN_EN,
 		&BootScriptContext::bootGeneric
 	},
+	// Cloud 9 CD Sampler Volume 2 - Windows - English
+	{
+		MTBOOT_C9SAMPLER_WIN_EN,
+		&BootScriptContext::bootGeneric
+	},
 };
 
 } // End of namespace Games
diff --git a/engines/mtropolis/detection.cpp b/engines/mtropolis/detection.cpp
index 487bb99c5c5..ffc31d8279d 100644
--- a/engines/mtropolis/detection.cpp
+++ b/engines/mtropolis/detection.cpp
@@ -78,6 +78,7 @@ static const PlainGameDescriptor mTropolisGames[] = {
 	{"poser3_sampler_zygote", "Poser 3 Zygote Sampler Disc"},
 	{"poser3_zygote", "Poser 3 Zygote Promo"},
 	{"wtextreme", "Whitetail Extreme"},
+	{"c9sampler", "Cloud 9 CD Sampler Volume 2"},
 
 
 	{"mtropolis", "mTropolis Title"},
diff --git a/engines/mtropolis/detection.h b/engines/mtropolis/detection.h
index a4227390303..5a5de98b272 100644
--- a/engines/mtropolis/detection.h
+++ b/engines/mtropolis/detection.h
@@ -81,6 +81,7 @@ enum MTropolisGameID {
 	GID_POSER3_SAMPLER_ZYGOTE = 48,
 	GID_POSER3_ZYGOTE		= 49,
 	GID_WTEXTREME			= 50,
+	GID_C9SAMPLER			= 51,
 
 	GID_GENERIC				= 99,
 };
@@ -144,9 +145,7 @@ enum MTropolisGameBootID {
 	MTBOOT_WORLDBROKE_EN,
 
 	MTBOOT_IDINO_RETAIL_EN,
-	MTBOOT_IDINO_DEMO_EN,
 	MTBOOT_IDOCTOR_RETAIL_EN,
-	MTBOOT_IDOCTOR_DEMO_EN,
 
 	MTBOOT_DILBERT_WIN_EN,
 	MTBOOT_FREEWILLY_WIN_EN,
@@ -187,6 +186,7 @@ enum MTropolisGameBootID {
 	MTBOOT_POSER3_SAMPLER_ZYGOTE_WIN_EN,
 	MTBOOT_POSER3_ZYGOTE_WIN_EN,
 	MTBOOT_WT_EXTREME_WIN_EN,
+	MTBOOT_C9SAMPLER_WIN_EN,
 };
 
 enum MTGameFlag {
diff --git a/engines/mtropolis/detection_tables.h b/engines/mtropolis/detection_tables.h
index d5287bec166..5809bdab736 100644
--- a/engines/mtropolis/detection_tables.h
+++ b/engines/mtropolis/detection_tables.h
@@ -1234,25 +1234,6 @@ static const MTropolisGameDescription gameDescriptions[] = {
 		MTBOOT_IDINO_RETAIL_EN,
 	},
 
-	{ // I Can Be a Dinosaur Finder - Demo (English, Windows)
-	  // Published by Macmillan, 1998
-		{
-			"idino",
-			"Demo",
-			{
-				{ "WBDFS.C9A", 0, "d28310a331ae07801e4e2fdc30a323b6", 172110125},
-			 	AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSUPPORTED | ADGF_DEMO,
-			GUIO0()
-		},
-		GID_IDINO,
-		0,
-		MTBOOT_IDINO_DEMO_EN,
-	},
-
 	{ // I Can Be an Animal Doctor (English, Windows)
 	  // Published by Macmillan, 1998
 		{
@@ -1272,13 +1253,15 @@ static const MTropolisGameDescription gameDescriptions[] = {
 		MTBOOT_IDOCTOR_RETAIL_EN,
 	},
 
-	{ // I Can Be an Animal Doctor - Demo (English, Windows)
-	  // Published by Macmillan, 1998
+	{ // Cloud 9 CD Sampler Volume 2 - Demo (English, Windows)
+	  // Published by Cloud 9 Interactive, 1997
 		{
-			"idoctor",
+			"c9sampler",
 			"Demo",
 			{
-				{"VETS.C9A", 0, "836765ba5202c146c5228933309e90cd", 149747132},
+				{ "RUNSAMP.C9A", 0, "349d9318b181ac4f6e0326a4b8fe7238", 5954633 },
+				//{ "VETS.C9A", 0, "836765ba5202c146c5228933309e90cd", 149747132 },
+				//{ "WBDFS.C9A", 0, "d28310a331ae07801e4e2fdc30a323b6", 172110125 },
 				AD_LISTEND
 			},
 			Common::EN_ANY,
@@ -1286,9 +1269,9 @@ static const MTropolisGameDescription gameDescriptions[] = {
 			ADGF_UNSUPPORTED | ADGF_DEMO,
 			GUIO0()
 		},
-		GID_IDINO,
+		GID_C9SAMPLER,
 		0,
-		MTBOOT_IDINO_DEMO_EN,
+		MTBOOT_C9SAMPLER_WIN_EN,
 	},
 
 	{ // How to Draw the Marvel Way (English, Windows)




More information about the Scummvm-git-logs mailing list