diff options
| author | Martin Kiewitz | 2010-07-18 16:25:23 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-18 16:25:23 +0000 |
| commit | 3189fe4a329ce5d762f8e396d188117f42325fa9 (patch) | |
| tree | cc93e12d2b010b21fb6cfd15fa24aa3a932cb119 /engines/sci/sound | |
| parent | aa5a1ddb473237b0b7a857c974850424f5c8a576 (diff) | |
| download | scummvm-rg350-3189fe4a329ce5d762f8e396d188117f42325fa9.tar.gz scummvm-rg350-3189fe4a329ce5d762f8e396d188117f42325fa9.tar.bz2 scummvm-rg350-3189fe4a329ce5d762f8e396d188117f42325fa9.zip | |
SCI: change to r50995 - better stop fading when stop is called
svn-id: r50996
Diffstat (limited to 'engines/sci/sound')
| -rw-r--r-- | engines/sci/sound/music.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 533bee8170..f359d5de93 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -388,7 +388,6 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { } } - pSnd->fadeStep = 0; // just make sure that previous fading isn't continued pSnd->status = kSoundPlaying; } @@ -411,6 +410,8 @@ void SciMusic::soundStop(MusicEntry *pSnd) { pSnd->pMidiParser->mainThreadEnd(); _mutex.unlock(); } + + pSnd->fadeStep = 0; // end fading, if fading was in progress } void SciMusic::soundSetVolume(MusicEntry *pSnd, byte volume) { |