Remove demo specific targets for HE games.

svn-id: r18870

1 files changed, 91 insertions, 95 deletions

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 7914a565cb..bb1b7d0881 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -202,12 +202,8 @@ static const ScummGameSettings scumm_settings[] = {
 #endif
 
 	// Humongous Entertainment Scumm Version 6
-	{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
-	  GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 	{"puttputt", "Putt-Putt Joins The Parade", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
-	{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 	{"puttmoon", "Putt-Putt Goes To The Moon", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 	{"funpack", "Putt-Putt's Fun Pack", GID_FUNPACK, 6, 61, MDT_ADLIB | MDT_NATIVE,
@@ -216,8 +212,6 @@ static const ScummGameSettings scumm_settings[] = {
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformPC},
 	{"fbear", "Fatty Bear's Birthday Surprise", GID_FBEAR, 6, 61, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
-	{"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_FBEAR, 6, 61, MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 
 #ifndef DISABLE_HE
 	{"activity", "Putt-Putt & Fatty Bear's Activity Pack", GID_HEGAME, 6, 70, MDT_NONE,
@@ -232,14 +226,8 @@ static const ScummGameSettings scumm_settings[] = {
 	// Humongous Entertainment Scumm Version 7.2
 	{"catalog2", "Humongous Interactive Catalog 2", GID_HEGAME, 6, 72, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 73, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"farm", "Let's Explore the Farm with Buzzy", GID_HEGAME, 6, 73, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"airport", "Let's Explore the Airport with Buzzy", GID_HEGAME, 6, 72, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, 73, MDT_NONE,
@@ -247,16 +235,10 @@ static const ScummGameSettings scumm_settings[] = {
 
 	{"puttzoo", "Putt-Putt Saves the Zoo", GID_HEGAME, 6, 72, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
 	// Humongous Entertainment Scumm Version 8.0 ?  Scummsrc.80
-	{"ff2-demo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_FREDDI2, 6, 80, MDT_NONE,
-	GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse", GID_FREDDI2, 6, 80, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_HEGAME, 6, 80, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_HEGAME, 6, 80, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 
@@ -274,32 +256,18 @@ static const ScummGameSettings scumm_settings[] = {
 	// Humongous Entertainment Scumm Version 9.0 ?  Scummsys.90
 	{"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"kinddemo", "Big Thinkers Kindergarten (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"thinkerk", "Big Thinkers Kindergarten", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"1grademo", "Big Thinkers First Grade (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"thinker1", "Big Thinkers First Grade", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"freddi3", "Freddi Fish 3: The Case of the Stolen Conch Shell", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"f3-mdemo", "Freddi Fish 3: The Case of the Stolen Conch Shell (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	// there is also a C++ engine based version of timedemo
-	{"TimeDemo", "Putt-Putt Travels Through Time (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"spyfox", "Spyfox 1: Dry Cereal", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	// there is also a C++ engine version of spydemo
-	{"Spydemo", "Spyfox 1: Dry Cereal (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"baseball", "Backyard Baseball", GID_HEGAME, 6, 90, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
 	// Humongous Entertainment Scumm Version 9.5 ?  Scummsys.95
-	{"pj2demo", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Demo)", GID_HEGAME, 6, 95, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"pajama2", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening", GID_HEGAME, 6, 95, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"chase", "Spy Fox in Cheese Chase Game", GID_HEGAME, 6, 95, MDT_NONE,
@@ -310,10 +278,8 @@ static const ScummGameSettings scumm_settings[] = {
 	// and INIB chunk in the .he0
 	{"lost", "Pajama Sam's Lost & Found", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"racedemo", "Putt-Putt Enters the Race (Demo)", GID_PUTTRACE, 6, 98, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"puttrace", "Putt-Putt Enters the Race", GID_PUTTRACE, 6, 98, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"BluesABCTimeDemo", "Blue's ABC Time (Demo)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"soccer", "Backyard Soccer", GID_HEGAME, 6, 98, MDT_NONE,
@@ -322,19 +288,11 @@ static const ScummGameSettings scumm_settings[] = {
 	// Global scripts increased to 2048
 	{"freddi4", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985 | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"f4-demo", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Demo)", GID_HEGAME, 6, 98, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985 | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 
 	// Engine moved to c++
 	// Humongous Entertainment Scumm Version 9.9 ?  Scummsys.99
-	{"smaller", "Pajama Sam's Lost & Found (Test)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
 	{"puttcircus", "Putt-Putt Joins the Circus", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformWindows},
-	{"circdemo", "Putt-Putt Joins the Circus (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"sf2-demo", "Spyfox 2: Some Assembly Required (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"spyfox2", "Spyfox 2: Some Assembly Required", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformWindows},
 	{"mustard", "Spy Fox in Hold the Mustard", GID_HEGAME, 6, 99, MDT_NONE,
@@ -345,8 +303,6 @@ static const ScummGameSettings scumm_settings[] = {
 	// Humongous Entertainment Scumm Version ?
 	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_FREDDICOVE, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
-	{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformWindows},
 	{"FreddisFunShop", "Freddi Fish's One-Stop Fun Shop", GID_FUNSHOP, 6, 99, MDT_NONE,
@@ -359,23 +315,15 @@ static const ScummGameSettings scumm_settings[] = {
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"spyozon", "Spyfox 3: Operation Ozone", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"sf3-demo", "Spyfox 3: Operation Ozone (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 
-	{"bb2demo", "Backyard Baseball 2001 (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, Common::kPlatformWindows},
 	{"baseball2001", "Backyard Baseball 2001", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"footdemo", "Backyard Football (Demo)", GID_FOOTBALL, 6, 99, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"SoccerMLS", "Backyard Soccer MLS Edition", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
 	// Humongous Entertainment Scumm Version ?
 	{"basketball", "Backyard Basketball", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_FREDDICOVE, 6, 100, MDT_NONE,
-	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 	{"pjgames", "Pajama Sam: Games to Play On Any Day", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 
@@ -430,6 +378,12 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"084ed0fa98a6d1e9368d67fe9cfbd417", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo) (puttputt cd)", GID_HEGAME, 6, 71, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"0855496dde35356b1a9691e22ba84cdc", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 73, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
+	{"566165a7338fa11029e7c14d94fa70d0", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 73, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
+	{"c8aac5e3e701874e2fa4117896f9e1b1", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Macintosh Demo)", GID_HEGAME, 6, 73, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 
 	{"8ee63cafb1fe9d62aa0d5a23117e70e7", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Updated)", GID_FREDDI2, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // FreddiCHSH
@@ -462,6 +416,10 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 	{"21abe302e1b1e2b66d6f5c12e241ebfd", "Freddi Fish 5: The Case of the Creature of Coral Cave (Unencrypted)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
+	{"45082a5c9f42ba14dacfe1fdeeba819d", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_FREDDICOVE, 6, 100, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
+	{"6b257bb2827dd894b8109a50a1a18b5a", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_FREDDICOVE, 6, 100, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 
 	{"4dbff3787aedcd96b0b325f2d92d7ad9", "Freddi Fish and Luther's Maze Madness (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
@@ -494,8 +452,12 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 
 	{"86c9902b7bec1a17926d4dae85beaa45", "Let's Explore the Airport with Buzzy (Demo) (puttputt cd)", GID_HEGAME, 6, 71, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"0557df19f046a84c2fdc63507c6616cb", "Let's Explore the Farm with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 	{"bf8b52fdd9a69c67f34e8e9fec72661c", "Let's Explore the Farm with Buzzy (Demo) (puttputt cd)", GID_HEGAME, 6, 71, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"8d479e36f35e80257dfc102cf4b8a912", "Let's Explore the Farm with Buzzy (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 
 	{"c24c490373aeb48fbd54caa8e7ae376d", "Loom (AtariST De)", GID_LOOM, 3, 0, MDT_PCSPK,
 	 GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformAtariST},
@@ -535,6 +497,8 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	{"c6907d44f1166941d982864cd42cdc89", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // PyjamaDBMN
 
+	{"a2bb6aa0537402c1b3c2ea899ccef64b", "Pajama Sam's Lost & Found (Test)", GID_HEGAME, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
 	{"a561d2e2413cc1c71d5a1bf87bf493ea", "Pajama Sam's Lost & Found (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
 
@@ -554,8 +518,12 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	 GF_USE_KEY, Common::kPlatformWindows},
 	{"6a30a07f353a75cdc602db27d73e1b42", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"31aa57f460a3d12429f0552a46a90b39", "Putt-Putt Joins The Parade (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
+	  GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 	{"37ff1b308999c4cca7319edfcc1280a0", "Putt-Putt Joins The Parade (Windows Demo)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"f40a7f495f59188ca57a9d1d50301bb6", "Putt-Putt Joins The Parade (Macintosh Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
+	  GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC},
 
 	{"92e7727e67f5cd979d8a1070e4eb8cb3", "Putt-Putt Saves the Zoo (Updated)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
@@ -568,6 +536,10 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"0ab19be9e2a3f6938226638b2a3744fe", "Putt-Putt Travels Through Time (Updated Demo)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"4e5867848ee61bc30d157e2c94eee9b4", "Putt-Putt Travels Through Time (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
+	{"6b19d0e25cbf720d05822379b8b90ed9", "Putt-Putt Travels Through Time (Demo)", GID_HEGAME, 6, 90, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows},
 
 	{"8e3241ddd6c8dadf64305e8740d45e13", "Putt-Putt and Pep's Balloon-O-Rama (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
@@ -685,52 +657,60 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "01.LFL", "maniac2.d64", kGenAsIs }, // swap
 	{ "00.LFL", "zak1.d64", kGenAsIs },    // these
 	{ "01.LFL", "zak2.d64", kGenAsIs },    // lines
-	{ "airdemo", "Airport Demo", kGenMac },
+	{ "airport", "airdemo", kGenPC },
+	{ "airport", "Airport Demo", kGenMac },
 	{ "atlantis", "fate", kGenPC },
 	{ "atlantis", "playfate", kGenPC },
 	{ "atlantis", "indy4", kGenPC },
 	{ "atlantis", "indydemo", kGenPC },
 	{ "balloon", "Balloon-O-Rama", kGenMac },
 	{ "baseball", "BaseBall", kGenMac },
+	{ "baseball2001", "bb2demo", kGenPC },
 	{ "baseball2001", "Baseball 2001", kGenMac },
 	{ "baseball2001", "baseball 2001", kGenPC },
 	{ "basketball", "Basketball", kGenMac },
 	{ "BluesABCTimeDemo", "BluesABCTimeDemo", kGenMac },
 	{ "chase", "Cheese Chase", kGenMac },
-	{ "circdemo", "Putt Circus Demo", kGenMac },
-	{ "circdemo", "Putt Circus Demo", kGenMac },
 	{ "dig.la0", "The Dig Data", kGenAsIs },
 	{ "dig.la0", "The Dig Demo Data", kGenAsIs },
 	{ "dig", "digdemo", kGenPC },
 	{ "dog", "Dog on a Stick", kGenMac },
-	{ "f3-mdemo", "F3-mdemo", kGenMac },
-	{ "f3-mdemo", "F3-Mdemo", kGenMac },
-	{ "f3-mdemo", "FF3-DEMO", kGenPC },
-	{ "f4-demo", "ff4demo", kGenPC },
-	{ "f4-demo", "Freddi 4 Demo", kGenMac },
-	{ "f4-demo", "ff4demo", kGenMac },
-	{ "farmdemo", "Farm Demo", kGenMac },
-	{ "fbdemo", "Fatty Bear Demo", kGenMacNoParens },
+	{ "farm", "farmdemo", kGenPC },
+	{ "farm", "Farm Demo", kGenMac },
+	{ "fbear", "fbdemo", kGenPC },
+	{ "fbear", "Fatty Bear Demo", kGenMacNoParens },
 	{ "fbear", "Fatty Bear", kGenMacNoParens },
-	{ "ff2-demo", "FFHSDemo", kGenMac },
-	{ "ff2-demo", "FFHSDemo", kGenPC },
-	{ "ff2-demo", "Freddi Fish 2 Demo", kGenMac },
-	{ "ff5demo", "FFCoveDemo", kGenPC },
 	{ "football", "FootBall", kGenMac },
-	{ "footdemo", "FootBall Demo", kGenMac },
-	{ "footdemo", "FootBall2002", kGenPC },
-	{ "freddemo", "Freddi Demo", kGenMac },
+	{ "football", "FootBall Demo", kGenMac },
+	{ "football", "FootBall2002", kGenPC },
+	{ "football", "footdemo", kGenPC },
+	{ "freddi", "freddemo", kGenPC },
+	{ "freddi", "Freddi Demo", kGenMac },
 	{ "freddi", "Freddi Fish", kGenMac },
 	{ "freddi", "FreddiD", kGenPC },
+	{ "freddi2", "FFHSDemo", kGenMac },
+	{ "freddi2", "ff2-demo", kGenPC },
+	{ "freddi2", "FFHSDemo", kGenPC },
+	{ "freddi2", "Freddi Fish 2 Demo", kGenMac },
 	{ "freddi2", "Freddi Fish 2", kGenMac },
 	{ "freddi2", "FreddiCHSH", kGenPC },
 	{ "freddi3", "Freddi Fish 3", kGenMac },
 	{ "freddi3", "FreddiSCS", kGenPC },
+	{ "freddi3", "F3-mdemo", kGenMac },
+	{ "freddi3", "F3-Mdemo", kGenMac },
+	{ "freddi3", "f3-mdemo", kGenPC },
+	{ "freddi3", "FF3-DEMO", kGenPC },
+	{ "freddi4", "f4-demo", kGenPC },
+	{ "freddi4", "ff4demo", kGenPC },
+	{ "freddi4", "Freddi 4 Demo", kGenMac },
+	{ "freddi4", "ff4demo", kGenMac },
 	{ "freddi4", "Freddi 4", kGenMac },
 	{ "freddi4", "FreddiHRBG", kGenPC },
 	{ "freddicove", "FreddiCCC", kGenPC },
 	{ "freddicove", "FreddiCove", kGenMac },
 	{ "freddicove", "FreddiDZZ", kGenPC },
+	{ "freddicove", "ff5demo", kGenPC },
+	{ "freddicove", "FFCoveDemo", kGenPC },
 	{ "FreddisFunShop", "Freddi's FunShop", kGenMac },
 	{ "ft.la0", "Full Throttle Data", kGenAsIs },
 	{ "ft.la0", "Full Throttle Demo Data", kGenAsIs },
@@ -739,33 +719,43 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "ft.la0", "ft.000", kGenAsIs },
 	{ "ft.la0", "ftdemo.000", kGenAsIs },
 	{ "ft", "ftdemo", kGenPC },
-	{ "kinddemo", "Kinddemo", kGenMac },
-	{ "kinddemo", "KindDemo", kGenMac },
 	{ "lost", "Lost and Found", kGenMac },
+	{ "lost", "smaller", kGenPC },
 	{ "maze", "Maze Madness", kGenMac},
 	{ "monkey", "monkey1", kGenPC },
 	{ "monkey", "monkeyk", kGenPC }, // FM-TOWNS Jap
 	{ "monkey", "game", kGenPC }, // SegaCD
 	{ "monkey2", "mi2demo", kGenPC },
-	{ "moondemo", "Putt-Putt Moon Demo", kGenMacNoParens },
 	{ "mustard", "Mustard", kGenMac },
 	{ "pajama", "Pajama Sam", kGenMac },
 	{ "pajama", "PajamaNHD", kGenPC },
 	{ "pajama2", "Pajama Sam 2", kGenMac },
 	{ "pajama2", "PajamaTAL", kGenPC },
 	{ "pajama2", "PyjamaDBMN", kGenPC },
-	{ "pj2demo", "PJ2Demo", kGenMac },
-	{ "pj2demo", "Pjs2demo", kGenPC },
-	{ "pj3-demo", "Pajama Sam 3-Demo", kGenMac },
-	{ "pj3-demo", "pj3demo", kGenPC },
-	{ "pj3-demo", "pj3demo", kGenMac },
-	{ "pjs-demo", "Pajama Sam Demo", kGenMac },
-	{ "pjs-demo", "PjSamDemo", kGenMac },
-	{ "pjs-demo", "PjSamDemo", kGenPC },
+	{ "pajama2", "PJ2Demo", kGenMac },
+	{ "pajama2", "pj2demo", kGenPC },
+	{ "pajama2", "Pjs2demo", kGenPC },
+	{ "pajama3", "Pajama Sam 3-Demo", kGenMac },
+	{ "pajama3", "pj3-demo", kGenPC },
+	{ "pajama3", "pj3demo", kGenPC },
+	{ "pajama3", "pj3demo", kGenMac },
+	{ "pajama3", "Pajama Sam Demo", kGenMac },
+	{ "pajama3", "PjSamDemo", kGenMac },
+	{ "pajama3", "PjSamDemo", kGenPC },
+	{ "puttcircus", "circdemo", kGenPC },
+	{ "puttcircus", "Putt Circus Demo", kGenMac },
+	{ "puttcircus", "Putt Circus Demo", kGenMac },
 	{ "puttcircus", "Putt Circus", kGenMac },
-	{ "puttdemo", "Putt-Putt's Demo", kGenMacNoParens },
+	{ "puttmoon", "moondemo", kGenPC },
+	{ "puttmoon", "Putt-Putt Moon Demo", kGenMacNoParens },
 	{ "puttmoon", "Putt-Putt Moon", kGenMacNoParens },
+	{ "puttputt", "puttdemo", kGenPC },
+	{ "puttputt", "Putt-Putt's Demo", kGenMacNoParens },
 	{ "puttputt", "Putt-Putt Parade", kGenMacNoParens },
+	{ "puttrace", "500demo", kGenPC },
+	{ "puttrace", "racedemo", kGenPC },
+	{ "puttrace", "RaceDemo", kGenMac },
+	{ "puttrace", "racedemo", kGenMac },
 	{ "puttrace", "Putt Race", kGenMac },
 	{ "PuttsFunShop", "Putt's FunShop", kGenMac },
 	{ "putttime", "PuttPuttTTT", kGenPC },
@@ -773,10 +763,13 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "putttime", "PuttTTT", kGenMac },
 	{ "putttime", "PuttTTT", kGenPC },
 	{ "putttime", "PuttPuttTTT", kGenMac },
+	{ "putttime", "TIJDDEMO", kGenPC },
+	{ "putttime", "timedemo", kGenPC },
+	{ "putttime", "TimeDemo", kGenMac },
+	{ "puttzoo", "Puttzoo Demo", kGenMac },
 	{ "puttzoo", "PuttZoo", kGenMac },
-	{ "racedemo", "500demo", kGenPC },
-	{ "racedemo", "RaceDemo", kGenMac },
-	{ "racedemo", "racedemo", kGenMac },
+	{ "puttzoo", "zoodemo", kGenPC },
+	{ "puttzoo", "Zoo Demo", kGenMac },
 	{ "samnmax.000", "Sam & Max Data", kGenAsIs },
 	{ "samnmax.000", "Sam & Max Demo Data", kGenAsIs },
 	{ "samnmax.000", "samnmax.sm0", kGenAsIs }, // Fixes MD5 detection
@@ -785,30 +778,33 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "samnmax", "snmdemo", kGenPC },
 	{ "samnmax", "snmidemo", kGenPC },
 	{ "SamsFunShop", "Sam's FunShop", kGenMac },
-	{ "sf2-demo", "sf2demo", kGenPC },
-	{ "sf2-demo", "Spy Fox 2 - Demo", kGenMac },
-	{ "sf3-demo", "Spy Ozone Demo", kGenMac },
 	{ "snmdemo", "sdemo", kGenPC },
 	{ "soccer", "Soccer", kGenMac },
 	{ "socks", "SockWorks", kGenMac },
-	{ "Spydemo", "FoxDemo", kGenMac },
-	{ "Spydemo", "foxdemo", kGenPC},
+	{ "spyfox", "FoxDemo", kGenMac },
+	{ "spyfox", "foxdemo", kGenPC},
+	{ "spyfox", "Spydemo", kGenPC},
 	{ "spyfox", "SPYFox", kGenMac },
 	{ "spyfox", "SPYFoxDC", kGenPC },
+	{ "spyfox2", "sf2-demo", kGenPC },
+	{ "spyfox2", "sf2demo", kGenPC },
+	{ "spyfox2", "Spy Fox 2 - Demo", kGenMac },
 	{ "spyfox2", "Spy Fox 2", kGenMac },
 	{ "spyfox2", "spyfoxsr", kGenPC },
+	{ "spyozon", "sf3-demo", kGenPC },
+	{ "spyozon", "Spy Ozone Demo", kGenMac },
 	{ "spyozon", "SPYFoxOZU", kGenPC },
 	{ "spyozon", "SpyOzon", kGenMac },
 	{ "tentacle.000", "Day Of The Tentacle Data", kGenAsIs },
 	{ "tentacle", "dottdemo", kGenPC },
 	{ "tentacle.000", "Day of the Tentacle Demo Data", kGenAsIs },
+	{ "thinker1", "1grademo", kGenPC },
 	{ "thinker1", "Thinker1", kGenMac },
+	{ "thinkerk", "kinddemo", kGenPC },
+	{ "thinkerk", "Kinddemo", kGenMac },
+	{ "thinkerk", "KindDemo", kGenMac },
 	{ "thinkerk", "ThinkerK", kGenMac },
-	{ "timedemo", "TIJDDEMO", kGenPC },
-	{ "timedemo", "TimeDemo", kGenMac },
 	{ "water", "Water Worries", kGenMac },
-	{ "zoodemo", "Puttzoo Demo", kGenMac },
-	{ "zoodemo", "Zoo Demo", kGenMac }
 };
 
 static int compareMD5Table(const void *a, const void *b) {