Ticket #8316: samnmax.diff

File samnmax.diff, 966 bytes (added by eriktorbjorn, 17 years ago)

Patch against a January 27 CVS snapshot

  • scummvm/scumm/saveload.cpp

    diff -ur ScummVM-cvs20040127/scummvm/scumm/saveload.cpp ScummVM-cvs20040127+hack/scummvm/scumm/saveload.cpp
    old new  
    124124
    125125        memcpy(_saveLoadName, hdr.name, sizeof(hdr.name));
    126126
    127         _sound->stopAllSounds();
     127        // When the engine does a temporary save/restore it won't save the
     128        // iMUSE state. In that case we shouldn't stop the music either. This
     129        // stops the Mole Man theme from going quiet in Sam & Max when Doug
     130        // tells you about the Ball of Twine.
     131        //
     132        // If we don't have iMUSE at all we may as well stop the sounds.
     133        //
     134        // Of course, stopAllSounds() stops more than just the music, but I
     135        // hope that won't cause any trouble.
     136
     137        if (!_imuse || _saveSound || !_saveLoadCompatible)
     138                _sound->stopAllSounds();
     139
    128140        _sound->stopCD();
    129141
    130142        _sound->pauseSounds(true);