Ticket #8252: sky-floppy-intro.diff

File sky-floppy-intro.diff, 4.1 KB (added by eriktorbjorn, 16 years ago)

Patch against a July 4 CVS snapshot

  • scummvm/README

    diff -ur ScummVM+orig/scummvm/README ScummVM+hack/scummvm/README
    old new  
    379379        --multi-midi   - enable combination Adlib and native MIDI
    380380        --native-mt32  - true Roland MT-32 (disable GM emulation)
    381381        --aspect-ratio - enable aspect ratio correction
     382        --floppy-intro - Use floppy version intro for Beneath a Steel Sky CD
    382383
    383384The meaning of long options can be inversed by prefixing them with "no-", e.g.
    384385--no-aspect-ratio. This is useful if you want to override a setting in the
  • scummvm/common/gameDetector.cpp

    diff -ur ScummVM+orig/scummvm/common/gameDetector.cpp ScummVM+hack/scummvm/common/gameDetector.cpp
    old new  
    8383        "\t--multi-midi   - enable combination Adlib and native MIDI\n"
    8484        "\t--native-mt32  - true Roland MT-32 (disable GM emulation)\n"
    8585        "\t--aspect-ratio - enable aspect ratio correction\n"
     86#ifndef DISABLE_SKY
     87        "\t--floppy-intro - Use floppy version intro for Beneath a Steel Sky CD\n"
     88#endif
    8689        "\n"
    8790        "The meaning of long options can be inverted by prefixing them with \"no-\",\n"
    8891        "e.g. \"--no-aspect-ratio\".\n"
     
    163166        _amiga = false;
    164167        _language = 0;
    165168
     169#ifndef DISABLE_SKY
     170        _floppyIntro = false;
     171#endif
     172
    166173        _talkSpeed = 60;
    167174        _debugMode = 0;
    168175        _debugLevel = 0;
     
    260267                        exit(-1);
    261268                }
    262269
     270#ifndef DISABLE_SKY
     271        _floppyIntro = g_config->getBool("floppy_intro", _floppyIntro);
     272#endif
     273
    263274        if ((val = g_config->get("language")))
    264275                if ((_language = parseLanguage(val)) == -1) {
    265276                        printf("Error in the config file: invalid language.\n");
     
    469480                                } else if (!strcmp (s, "aspect-ratio")) {
    470481                                        _aspectRatio = long_option_value;
    471482                                        g_config->setBool ("aspect_ratio", _aspectRatio);
     483#ifndef DISABLE_SKY
     484                                } else if (!strcmp (s, "floppy-intro")) {
     485                                        _floppyIntro = long_option_value;
     486                                        g_config->setBool ("floppy_intro", _floppyIntro);
     487#endif
    472488                                } else {
    473489                                        goto ShowHelpAndExit;
    474490                                }
  • scummvm/common/gameDetector.h

    diff -ur ScummVM+orig/scummvm/common/gameDetector.h ScummVM+hack/scummvm/common/gameDetector.h
    old new  
    120120        bool _amiga;
    121121        int _language;
    122122
     123        bool _floppyIntro;
     124
    123125        uint16 _talkSpeed;
    124126        uint16 _debugMode;
    125127        uint16 _debugLevel;
  • scummvm/sky/intro.cpp

    diff -ur ScummVM+orig/scummvm/sky/intro.cpp ScummVM+hack/scummvm/sky/intro.cpp
    old new  
    205205
    206206        uint32 *commandPtr = (uint32 *)zeroCommands;
    207207
     208        if (!isCDVersion())
     209                _floppyIntro = true;
     210
    208211        _skyDisk->prefetchFile(60112); // revolution screen
    209212        _skyDisk->prefetchFile(60113); // revolution palette
    210213
     
    214217        escDelay(3000); //keep virgin screen up for 3 seconds
    215218        CHECK_ESC
    216219       
    217         if (!isCDVersion())
     220        if (_floppyIntro)
    218221                _skyMusic->startMusic(1);
    219222       
    220223        escDelay(3000); //and another 3 seconds.
     
    242245        _skyScreen->paletteFadeUp(60115);
    243246
    244247
    245         if (isCDVersion()) {
     248        if (!_floppyIntro) {
    246249                return doCDIntro();
    247250        } else {
    248251                _skyDisk->prefetchFile(FN_A_PAL);
  • scummvm/sky/sky.cpp

    diff -ur ScummVM+orig/scummvm/sky/sky.cpp ScummVM+hack/scummvm/sky/sky.cpp
    old new  
    7171        _systemVars.language = detector->_language;
    7272        _detector = detector;
    7373
     74        _floppyIntro = detector->_floppyIntro;
     75
    7476        _introTextSpace = 0;
    7577        _introTextSave = 0;
    7678}
  • scummvm/sky/sky.h

    diff -ur ScummVM+orig/scummvm/sky/sky.h ScummVM+hack/scummvm/sky/sky.h
    old new  
    6565        byte *_introTextSpace;
    6666        byte *_introTextSave;
    6767
     68        bool _floppyIntro;
     69
    6870        uint16 _debugMode;
    6971        uint16 _debugLevel;
    7072        bool _paintGrid;