diff options
| author | Johannes Schickel | 2008-04-14 20:57:24 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-14 20:57:24 +0000 |
| commit | 10fe009db3beb54b75b2062c2e475b1073ba9784 (patch) | |
| tree | d3c153bfba952c0581d5d349bdde33e18022ba28 | |
| parent | 91dafda25095cb897a765318bc68bcb1dda3b722 (diff) | |
| download | scummvm-rg350-10fe009db3beb54b75b2062c2e475b1073ba9784.tar.gz scummvm-rg350-10fe009db3beb54b75b2062c2e475b1073ba9784.tar.bz2 scummvm-rg350-10fe009db3beb54b75b2062c2e475b1073ba9784.zip | |
Fixed music fade out.
svn-id: r31506
| -rw-r--r-- | engines/kyra/kyra_v3.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/sound_digital.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index cc86af8ddc..2f42d6ec82 100644 --- a/engines/kyra/kyra_v3.cpp +++ b/engines/kyra/kyra_v3.cpp @@ -332,7 +332,6 @@ int KyraEngine_v3::musicUpdate(int forceRestart) { if (!lock) { lock = 1; if (_musicSoundChannel >= 0) { - _soundDigital->stopAllSounds(); if (!_soundDigital->isPlaying(_musicSoundChannel)) { if (_curMusicTrack != -1) playMusicTrack(_curMusicTrack, 1); diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp index 6ec57b64db..d256f9eb6f 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound_digital.cpp @@ -311,7 +311,7 @@ int AUDStream::readChunk(int16 *buffer, const int maxSamples) { } if (_fading < 0 && _fadeCount == 0) - _fading = false; + _fading = 0; return samplesProcessed; } |