Ticket #6730: ppm2.diff

File ppm2.diff, 3.5 KB (added by SF/nukeykt, 10 years ago)

  • engines/scumm/detection_tables.h 

     engines/scumm/detection_tables.h | 1 +
 engines/scumm/imuse/imuse.cpp    | 2 +-
 engines/scumm/scumm-md5.h        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index ae334c2..7053a1f 100644
    a b static const GameSettings gameVariantsTable[] = {  
    278278        {"fbear", "HE 70", 0, GID_FBEAR, 6, 70, MDT_NONE,             GF_USE_KEY, Common::kPlatformWindows, GUIO2(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI)},
    279279
    280280        {"puttmoon", "", 0, GID_PUTTMOON, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO1(GUIO_NOLAUNCHLOAD)},
     281        {"puttmoon", "Demo", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO1(GUIO_NOLAUNCHLOAD)},
    281282        {"puttmoon", "HE 70", 0, GID_PUTTMOON, 6, 70, MDT_NONE,             GF_USE_KEY, Common::kPlatformWindows, GUIO2(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI)},
    282283
    283284        {"puttputt", "HE 60", 0, GID_HEGAME,   6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO1(GUIO_NOLAUNCHLOAD)},

  • engines/scumm/imuse/imuse.cpp 

    diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 8b892f5..d3d8c5b 100644
    a b bool IMuseInternal::isMT32(int sound) {  
    170170
    171171        case MKTAG('M', 'I', 'D', 'I'): // Occurs in Sam & Max
    172172                // HE games use Roland music
    173                 if (ptr[8] == 'H' && ptr[9] == 'S')
     173                if (ptr[8] == 'H' && ptr[9] == 'S' && _game_id != GID_PUTTMOON)
    174174                        return true;
    175175                else
    176176                        return false;

  • engines/scumm/scumm-md5.h 

    diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 0eeff57..6d4a1de 100644
    a b static const MD5Table md5table[] = {  
    206206        { "499c958affc394f2a3868f1eb568c3ee", "freddi4", "HE 99", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
    207207        { "49a1739981a89066b1121fac04b710f4", "spyfox2", "HE CUP", "Preview", 5756234, Common::UNK_LANG, Common::kPlatformUnknown },
    208208        { "4aa93cb30e485b728504ba3a693f12bf", "pajama", "HE 100", "", -1, Common::RU_RUS, Common::kPlatformWindows },
    209         { "4af4a6b248103c1fe9edef619677f540", "puttmoon", "", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
     209        { "4af4a6b248103c1fe9edef619677f540", "puttmoon", "Demo", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
    210210        { "4afb734df8315ee412669c812d4cf0a1", "freddi", "HE 100", "", 34837, Common::FR_FRA, Common::kPlatformWii },
    211211        { "4ba37f835be11a59d969f90f272f575b", "water", "HE 80", "", -1, Common::EN_USA, Common::kPlatformUnknown },
    212212        { "4ba7fb331296c283e73d8f5b2096e551", "samnmax", "", "CD", -1, Common::ES_ESP, Common::kPlatformUnknown },
    … … static const MD5Table md5table[] = {  
    465465        { "a9543ef0d79bcb47cd76ec197ad0a967", "puttmoon", "", "", -1, Common::EN_ANY, Common::kPlatform3DO },
    466466        { "a99c39ba65b6086be28aef576da69595", "spyozon", "", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
    467467        { "a9f2f04b1ecaab9495b59befffe9bf88", "pajama3", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
    468         { "aa6a91b7f6f119d1b7b1f2a4c9e24d59", "puttmoon", "", "Demo", 6233, Common::EN_ANY, Common::kPlatformDOS },
     468        { "aa6a91b7f6f119d1b7b1f2a4c9e24d59", "puttmoon", "Demo", "Demo", 6233, Common::EN_ANY, Common::kPlatformDOS },
    469469        { "aa7a07d94ae853f6460be4ce0a1bf530", "monkey", "EGA", "EGA", -1, Common::FR_FRA, Common::kPlatformDOS },
    470470        { "aa81aa6d5545ce172fdba81f2e2f9d36", "puttzoo", "", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
    471471        { "aa8a0cb65f3afbbe2c14c3f9f92775a3", "monkey", "CD", "CD", 8955, Common::FR_FRA, Common::kPlatformDOS },