diff options
| author | Filippos Karapetis | 2010-01-26 13:06:21 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-26 13:06:21 +0000 |
| commit | 31a3c98fa26e59e5cf9254efeb6e5711ee674aa7 (patch) | |
| tree | 5c3bd2b1521c617371ebab18d29347e1d5bc9217 | |
| parent | 87ff1c7b7eba9aa0f599b00a280279018bdbf5ce (diff) | |
| download | scummvm-rg350-31a3c98fa26e59e5cf9254efeb6e5711ee674aa7.tar.gz scummvm-rg350-31a3c98fa26e59e5cf9254efeb6e5711ee674aa7.tar.bz2 scummvm-rg350-31a3c98fa26e59e5cf9254efeb6e5711ee674aa7.zip | |
Removed the unnecessary fadeVolume variable
svn-id: r47566
| -rw-r--r-- | engines/sci/sound/music.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 3e806f06b1..8ef636c80f 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -474,15 +474,13 @@ void MusicEntry::doFade() { if (fadeTicker) fadeTicker--; else { - int16 fadeVolume = volume; fadeTicker = fadeTickerStep; - fadeVolume += fadeStep; - if (((fadeStep > 0) && (fadeVolume >= fadeTo)) || ((fadeStep < 0) && (fadeVolume <= fadeTo))) { - fadeVolume = fadeTo; + volume += fadeStep; + if (((fadeStep > 0) && (volume >= fadeTo)) || ((fadeStep < 0) && (volume <= fadeTo))) { + volume = fadeTo; fadeStep = 0; fadeCompleted = true; } - volume = fadeVolume; // Only process MIDI streams in this thread, not digital sound effects if (pMidiParser) |