diff options
| author | Max Horn | 2006-04-08 22:05:45 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-08 22:05:45 +0000 |
| commit | c8ea13139d4f5f18096d1d2be965a087c06d3817 (patch) | |
| tree | 0081d5c3deb61e491c68a620bd27250df0a5477b | |
| parent | fbe311ce6c6481e674d5194da7ac7f3ee9f28055 (diff) | |
| download | scummvm-rg350-c8ea13139d4f5f18096d1d2be965a087c06d3817.tar.gz scummvm-rg350-c8ea13139d4f5f18096d1d2be965a087c06d3817.tar.bz2 scummvm-rg350-c8ea13139d4f5f18096d1d2be965a087c06d3817.zip | |
Our extra_versions table is a bit too eager in some cases to assign platform values; fixing some of these cases and adding code that detects these and triggers an according warning
svn-id: r21700
| -rw-r--r-- | engines/scumm/plugin.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index 3b597bad46..6c48eab037 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -424,15 +424,15 @@ static const GameSettings extra_versions[] = { /* Scumm Version 5 */ - {"monkey2", 0, GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, + {"monkey2", 0, GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, - {"atlantis", 0, GID_INDY4, 5, 0, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, + {"atlantis", 0, GID_INDY4, 5, 0, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, /* Scumm Version 6 */ - {"tentacle", 0, GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, + {"tentacle", 0, GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, - {"samnmax", 0, GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, + {"samnmax", 0, GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, #ifndef DISABLE_SCUMM_7_8 @@ -1352,8 +1352,12 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { // Perfect match found, use it and stop the loop game = *g; game.gameid = gameid; - if (elem->platform != Common::kPlatformUnknown) + if (elem->platform != Common::kPlatformUnknown) { + if (game.platform != Common::kPlatformUnknown && game.platform != elem->platform) + warning("Platform values differ for MD5 '%s': %d vs %d (please report to Fingolfin)", + md5, game.platform, elem->platform); game.platform = elem->platform; + } break; } } |