diff options
| author | Jonathan Gray | 2003-02-17 21:37:56 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-02-17 21:37:56 +0000 |
| commit | e89941544377d8e0f9c3b5bff0347b3e6796d91e (patch) | |
| tree | 14e31057adc250065ff566f8123629220b3aff69 /common | |
| parent | 5b1983587cd5714df71379caa9976395adbe1c5f (diff) | |
| download | scummvm-rg350-e89941544377d8e0f9c3b5bff0347b3e6796d91e.tar.gz scummvm-rg350-e89941544377d8e0f9c3b5bff0347b3e6796d91e.tar.bz2 scummvm-rg350-e89941544377d8e0f9c3b5bff0347b3e6796d91e.zip | |
make good on GF_NEW_COSTUMES threats
svn-id: r6616
Diffstat (limited to 'common')
| -rw-r--r-- | common/gameDetector.cpp | 16 | ||||
| -rw-r--r-- | common/gameDetector.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index d39c775f13..74e03ba9f7 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -128,17 +128,17 @@ const VersionSettings version_settings[] = { {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_SAMNMAX, 6, 1, 1, GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, {"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_SAMNMAX, 6, 1, 1, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_SAMNMAX, 6, 1, 1, GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_SAMNMAX, 6, 1, 1, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"funpack", "Putt-Putt's Fun Pack", GID_SAMNMAX, 6, 1, 1, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_SAMNMAX, 6, 1, 1, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_SAMNMAX, 6, 1, 1, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, 4, 2, GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT, 0}, {"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, 3, 2, @@ -154,9 +154,9 @@ const VersionSettings version_settings[] = { /* Scumm Version 7 */ {"ft", "Full Throttle", GID_FT, 7, 3, 0, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7 | GF_NEW_COSTUMES, 0}, {"dig", "The Dig", GID_DIG, 7, 5, 0, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7 | GF_NEW_COSTUMES, 0}, /* Simon the Sorcerer 1 & 2 (not SCUMM games) */ {"simon1dos", "Simon the Sorcerer 1 for DOS", GID_SIMON_FIRST+0, 99, 99, 99, 0, "GAMEPC"}, @@ -177,7 +177,7 @@ const VersionSettings version_settings[] = { /* Scumm Version 8 */ {"comi", "The Curse of Monkey Island", GID_CMI, 8, 1, 0, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7 | GF_AFTER_V8, 0}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7 | GF_AFTER_V8 | GF_NEW_COSTUMES, 0}, {NULL, NULL, 0, 0, 0, 0, 0, NULL} }; diff --git a/common/gameDetector.h b/common/gameDetector.h index 49598bfd84..1bd895ffc0 100644 --- a/common/gameDetector.h +++ b/common/gameDetector.h @@ -65,7 +65,6 @@ enum GameFeatures { GF_AFTER_V7 = 4, GF_HAS_ROOMTABLE = GF_AFTER_V7, GF_USE_KEY = 8, - GF_NEW_COSTUMES = GF_AFTER_V7, GF_USE_ANGLES = GF_AFTER_V7, GF_DRAWOBJ_OTHER_ORDER = 16, @@ -82,7 +81,8 @@ enum GameFeatures { GF_ADLIB_DEFAULT = 4096, GF_AMIGA = 8192, GF_HUMONGOUS = 16384, - GF_AFTER_V8 = 32768 + GF_AFTER_V8 = 32768, + GF_NEW_COSTUMES = 65536 }; struct VersionSettings { |