aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-03-03 13:19:22 +0000
committerTravis Howell2007-03-03 13:19:22 +0000
commit4ec8c6ca4378a4148969b6004d8f950d848a31a3 (patch)
treeb725924c74ac64359856ef353028ec0f4d048df6
parentb0fea397ab22e3956106a3429994d794686d17e7 (diff)
downloadscummvm-rg350-4ec8c6ca4378a4148969b6004d8f950d848a31a3.tar.gz
scummvm-rg350-4ec8c6ca4378a4148969b6004d8f950d848a31a3.tar.bz2
scummvm-rg350-4ec8c6ca4378a4148969b6004d8f950d848a31a3.zip
Correct feature flags for the PC Engine version of Loom.
svn-id: r25952
-rw-r--r--engines/scumm/plugin.cpp4
-rw-r--r--engines/scumm/scumm.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 4b5ec4027d..d9c4e3a4dd 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -224,8 +224,8 @@ static const GameSettings gameVariantsTable[] = {
{"loom", "EGA", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI, 0, UNK},
{"loom", "No Adlib", "ega", GID_LOOM, 3, 0, MDT_PCSPK, 0, UNK},
+ {"loom", "PC-Engine", 0, GID_LOOM, 3, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformPCEngine},
{"loom", "FM-TOWNS", 0, GID_LOOM, 3, 0, MDT_TOWNS, GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformFMTowns},
- {"loom", "PC-Engine", 0, GID_LOOM, 3, 0, MDT_NONE, GF_16COLOR | GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformPCEngine},
{"loom", "VGA", "vga", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformPC},
{"pass", 0, 0, GID_PASS, 4, 0, MDT_PCSPK | MDT_ADLIB, GF_16COLOR, Common::kPlatformPC},
@@ -1660,7 +1660,7 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) {
*engine = new ScummEngine_v2(syst, res);
break;
case 3:
- if (res.game.features & GF_OLD256)
+ if ((res.game.features & GF_OLD256) || res.game.platform == Common::kPlatformPCEngine)
*engine = new ScummEngine_v3(syst, res);
else
*engine = new ScummEngine_v3old(syst, res);
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9c7d8b6a7c..275ac09625 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -595,8 +595,9 @@ ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr)
: ScummEngine(syst, dr) {
// All "classic" games (V5 and older) encrypted their data files
- // with exception of the GF_OLD256 games.
- if (!(_game.features & GF_OLD256))
+ // with exception of the GF_OLD256 games and the PC-Engine version
+ // of Loom.
+ if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine)
_game.features |= GF_USE_KEY;
static const uint16 default_cursor_images[4][16] = {