diff options
| author | Max Horn | 2003-12-21 00:40:42 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-21 00:40:42 +0000 |
| commit | fbcca630582d141d9bca1b2fad053ae089f096f0 (patch) | |
| tree | af40dbfa145e036cfd7b1927ffdb7b388f022531 /scumm/sound.cpp | |
| parent | c55652d4a60ee51dde381417c590fff9a59ecb0d (diff) | |
| download | scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.tar.gz scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.tar.bz2 scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.zip | |
Incorrect use of stopChannel (must be stopHandle); replaced single remaining use of stopChannel by a hack (note: the code in question is a hack in itself already)
svn-id: r11799
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 063331f393..6a5ade9e5c 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -548,7 +548,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle || (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) { for (i = 0; i < SoundMixer::NUM_CHANNELS; i++) { if (i != talkChannel) { - _scumm->_mixer->stopChannel(i); + _scumm->_mixer->stopHandle(i+1); // EVIL HACK!!!! } } } @@ -1078,7 +1078,7 @@ void Sound::stopBundleMusic() { // First stop the music timer _scumm->_timer->removeTimerProc(&music_handler); _nameBundleMusic = ""; - _scumm->_mixer->stopChannel(_bundleMusicTrack); + _scumm->_mixer->stopHandle(_bundleMusicTrack); if (_musicBundleBufFinal) { free(_musicBundleBufFinal); _musicBundleBufFinal = NULL; |