Ticket #8068: nocd.diff

File nocd.diff, 1.3 KB (added by eriktorbjorn, 24 years ago)

Patch against a September 27 CVS snapshot

  • scummvm/scumm/scumm.h 

    diff -ur ScummVM-cvs20020927/scummvm/scumm/scumm.h ScummVM-cvs20020927+hack/scummvm/scumm/scumm.h
    old new  
    957957        char transText[200];
    958958
    959959        bool checkFixedDisk();
    960         int _cdrom;
    961960
    962961#if defined(SCUMM_LITTLE_ENDIAN)
    963962        uint32 fileReadDword() { return _fileHandle.readDwordLE(); }

  • scummvm/scumm/scummvm.cpp 

    diff -ur ScummVM-cvs20020927/scummvm/scumm/scummvm.cpp ScummVM-cvs20020927+hack/scummvm/scumm/scummvm.cpp
    old new  
    8787        _features = detector->_features;
    8888        _soundCardType = detector->_soundCardType;
    8989        _noSubtitles = detector->_noSubtitles;
    90         _cdrom = detector->_cdrom;
    9190        _defaultTalkDelay = detector->_talkSpeed;
    9291        _use_adlib = detector->_use_adlib;
    9392       
    … …  
    117116        /* Initialize backend */
    118117        syst->init_size(_realWidth, _realHeight);
    119118        prop.cd_num = detector->_cdrom;
    120         syst->property(OSystem::PROP_OPEN_CD, &prop);
     119        if (prop.cd_num >= 0)
     120                syst->property(OSystem::PROP_OPEN_CD, &prop);
    121121
    122122        /* Bind the mixer to the system => mixer will be invoked
    123123         * automatically when samples need to be generated */