diff options
author | Travis Howell | 2005-10-28 06:58:33 +0000 |
---|---|---|
committer | Travis Howell | 2005-10-28 06:58:33 +0000 |
commit | 572fbb7915965ea121afbaa794d1ab4025caf1ce (patch) | |
tree | 2b9f18f4e82ac9b47708134fb9c41a21794a1190 /scumm | |
parent | e1eb5d73bc67abeb0fdadeac6bcae95814f7b2e2 (diff) | |
download | scummvm-rg350-572fbb7915965ea121afbaa794d1ab4025caf1ce.tar.gz scummvm-rg350-572fbb7915965ea121afbaa794d1ab4025caf1ce.tar.bz2 scummvm-rg350-572fbb7915965ea121afbaa794d1ab4025caf1ce.zip |
Fix old airdemo/farmdemo regression.
Remove duplicate catalog target.
svn-id: r19335
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/scumm.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 821023c591..b9ea6d4240 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -233,33 +233,33 @@ static const ScummGameSettings scumm_settings[] = { // Humongous Entertainment Scumm Version 7.1 // The first version to use 640x480 resolution - // There are also 7.1 versions of freddi, freddemo, airdemo and farmdemo + // There are also 7.1 versions of freddemo, airdemo and farmdemo {"catalog", "Humongous Interactive Catalog", GID_HEGAME, 6, 71, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, + GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, + {"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_HEGAME, 6, 71, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, // 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}, - {"farm", "Let's Explore the Farm with Buzzy", GID_HEGAME, 6, 73, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES, 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, - GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - + GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, {"puttzoo", "Putt-Putt Saves the Zoo", 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 | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, + {"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, 73, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, + // Humongous Entertainment Scumm Version 8.0 ? Scummsrc.80 {"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}, {"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}, - {"dog", "Putt-Putt and Pep's Dog on a Stick", GID_HEGAME, 6, 80, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, {"balloon", "Putt-Putt and Pep's Balloon-O-Rama", GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, + {"dog", "Putt-Putt and Pep's Dog on a Stick", GID_HEGAME, 6, 80, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, {"maze", "Freddi Fish and Luther's Maze Madness", GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, {"socks", "Pajama Sam's Sock Works", GID_HEGAME, 6, 80, MDT_NONE, @@ -268,8 +268,8 @@ static const ScummGameSettings scumm_settings[] = { GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // 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}, + {"baseball", "Backyard Baseball", 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}, {"thinker1", "Big Thinkers First Grade", GID_HEGAME, 6, 90, MDT_NONE, @@ -278,8 +278,6 @@ static const ScummGameSettings scumm_settings[] = { 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}, - {"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 {"pajama2", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening", GID_HEGAME, 6, 95, MDT_NONE, @@ -305,14 +303,14 @@ static const ScummGameSettings scumm_settings[] = { // Engine moved to c++ // Humongous Entertainment Scumm Version 9.9 ? Scummsys.99 + {"football", "Backyard Football", GID_FOOTBALL, 6, 99, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES, 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}, {"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, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformWindows}, - {"football", "Backyard Football", GID_FOOTBALL, 6, 99, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // Humongous Entertainment Scumm Version ? {"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 99, MDT_NONE, @@ -371,6 +369,9 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { {"2e85f7aa054930c692a5b1bed1dfc295", "Backyard Football 2002 (Demo Updated)", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformUnknown}, // Football2002 + {"037385a953789190298494d92b89b3d0", "Humongous Interactive Catalog (Updated)", GID_HEGAME, 6, 72, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, + {"8fec68383202d38c0d25e9e3b757c5df", "The Curse of Monkey Island (Demo)", GID_CMI, 8, 0, MDT_NONE, GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, Common::kPlatformWindows}, @@ -384,13 +385,11 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { {"22c9eb04455440131ffc157aeb8d40a8", "Fatty Bear's Birthday Surprise (Windows Demo)", GID_FBEAR, 6, 70, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - {"c0039ad982999c92d0de81910d640fa0", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Dutch)", GID_HEGAME, 6, 71, MDT_NONE, + {"df047cc4792150f601290357566d36a6", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Updated)", GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - {"d4cccb5af88f3e77f370896e9ba8c5f9", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Russian)", GID_HEGAME, 6, 71, MDT_NONE, + {"746e88c172a5b7a1ae89ac0ee3ee681a", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Updated Russian)", GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - {"e63a0b9249b5ca4cc4d3ac34305ae360", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Norwegian Bokm\xE5l)", GID_HEGAME, 6, 99, MDT_NONE, - 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, + {"507bb360688dc4180fdf0d7597352a69", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Updated Swedish)", GID_HEGAME, 6, 90, 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}, @@ -466,12 +465,13 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { {"86c9902b7bec1a17926d4dae85beaa45", "Let's Explore the Airport with Buzzy (Demo)", GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - {"0557df19f046a84c2fdc63507c6616cb", "Let's Explore the Farm with Buzzy (Updated Dutch 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)", GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, {"8d479e36f35e80257dfc102cf4b8a912", "Let's Explore the Farm with Buzzy (Updated Demo)", GID_HEGAME, 6, 72, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, + {"0557df19f046a84c2fdc63507c6616cb", "Let's Explore the Farm with Buzzy (Updated Dutch Demo)", GID_HEGAME, 6, 72, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows}, {"a0a7dea72003933b8b3f8b99b9f7ddeb", "Loom (AtariST)", GID_LOOM, 3, 0, MDT_PCSPK, GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformAtariST}, |