Ticket #8093: conroy.diff

File conroy.diff, 1009 bytes (added by eriktorbjorn, 19 years ago)

Patch against an October 12 CVS snapshot

  • scummvm/scumm/sound.cpp

    diff -ur ScummVM-cvs20021012/scummvm/scumm/sound.cpp ScummVM-cvs20021012+hack/scummvm/scumm/sound.cpp
    old new  
    473473        // Some games frequently assume that starting one sound effect will
    474474        // automatically stop any other that may be playing at that time. So
    475475        // that is what we do here, but we make an exception for speech.
    476         // 
     476        //
    477477        // Do any other games than these need this hack?
     478        //
     479        // HACK: Checking for script 99 in Sam & Max is to keep Conroy's song
     480        // from being interrupted.
    478481
    479         if (mode == 1 && (_scumm->_gameId == GID_TENTACLE || _scumm->_gameId == GID_SAMNMAX)) {
     482        if (mode == 1 && (_scumm->_gameId == GID_TENTACLE
     483                || (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
    480484                for (int i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
    481485                        if (i != _talkChannel)
    482486                                _scumm->_mixer->stop(i);