Ticket #9213: working-patch.diff

File working-patch.diff, 2.8 KB (added by bluegr, 9 years ago)

Working patch from tsoliman

  • engines/scumm/detection_tables.h

    diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
    index 7463fa7..55f1fee 100644
    a b static const GameSettings gameVariantsTable[] = {  
    239239        {"monkey", "EGA",      "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_16COLOR,     Common::kPlatformPC, GUIO_NOSPEECH},
    240240        {"monkey", "No AdLib", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR,                        GF_16COLOR,     Common::kPlatformAtariST, GUIO_NOSPEECH | GUIO_NOMIDI},
    241241        {"monkey", "Demo",     "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_ADLIB,            GF_16COLOR,     Common::kPlatformPC, GUIO_NOSPEECH | GUIO_NOMIDI},
     242        {"monkey", "Fan Patch",    0, GID_MONKEY,     5, 0, MDT_ADLIB | MDT_MIDI,             GF_AUDIOTRACKS, UNK, GUIO_NONE},
    242243        {"monkey", "CD",           0, GID_MONKEY,     5, 0, MDT_ADLIB,                        GF_AUDIOTRACKS, UNK, GUIO_NOSPEECH | GUIO_NOMIDI},
    243244        {"monkey", "FM-TOWNS",     0, GID_MONKEY,     5, 0, MDT_TOWNS,                        GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO_NOSPEECH | GUIO_NOMIDI | GUIO_MIDITOWNS},
    244245        {"monkey", "SEGA",         0, GID_MONKEY,     5, 0, MDT_NONE,                         GF_AUDIOTRACKS, Common::kPlatformSegaCD, GUIO_NOSPEECH | GUIO_NOMIDI},
    245246
    246247        {"monkey2",  "", 0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO_NOSPEECH},
    247248        {"monkey2", "FM-TOWNS", 0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO_NOSPEECH | GUIO_MIDITOWNS | GUIO_MIDIADLIB | GUIO_MIDIMT32},
     249        {"monkey2", "Fan Patch", 0, GID_MONKEY2, 5, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO_NONE},
    248250
    249251        {"atlantis", "", 0, GID_INDY4,    5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO_NONE},
    250252        {"atlantis", "Floppy", 0, GID_INDY4,    5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO_NOSPEECH},
  • engines/scumm/script_v5.cpp

    diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
    index 02c8d97..660789f 100644
    a b void ScummEngine_v5::o5_roomOps() {  
    18151815                        if (_game.id == GID_INDY4) {
    18161816                                filename = _targetName + ".iq";
    18171817                        } else {
    1818                                 error("SO_SAVE_STRING: Unsupported filename %s", filename.c_str());
     1818                                filename = _targetName + "_" + filename.c_str();
    18191819                        }
    18201820
    18211821                        Common::OutSaveFile *file = _saveFileMan->openForSaving(filename);
    void ScummEngine_v5::o5_roomOps() {  
    18421842                        if (_game.id == GID_INDY4) {
    18431843                                filename = _targetName + ".iq";
    18441844                        } else {
    1845                                 error("SO_LOAD_STRING: Unsupported filename %s", filename.c_str());
     1845                                filename = _targetName + "_" + filename.c_str();
    18461846                        }
    18471847
    18481848                        Common::InSaveFile *file = _saveFileMan->openForLoading(filename);