diff options
| author | Martin Kiewitz | 2010-05-27 20:53:37 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-27 20:53:37 +0000 |
| commit | d2513c9cc25c29a2e32882e0617dfc5d5854a6c2 (patch) | |
| tree | afa33ad859790f9cc637aa42e6ebb78a748db0ea | |
| parent | 4ba291d4b18271f6e313e3a207e668dc6599aab9 (diff) | |
| download | scummvm-rg350-d2513c9cc25c29a2e32882e0617dfc5d5854a6c2.tar.gz scummvm-rg350-d2513c9cc25c29a2e32882e0617dfc5d5854a6c2.tar.bz2 scummvm-rg350-d2513c9cc25c29a2e32882e0617dfc5d5854a6c2.zip | |
SCI: enabling fading again, issues in pharkas and gk1demo are actually "normal" - maybe we should add some hack workaround, but the delay in ssci was just slow resource loading
svn-id: r49269
| -rw-r--r-- | engines/sci/sound/music.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 2b203af93e..d8a7985288 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -37,9 +37,6 @@ namespace Sci { -// When defined, volume fading immediately sets the final sound volume -#define DISABLE_VOLUME_FADING - SciMusic::SciMusic(SciVersion soundVersion) : _soundVersion(soundVersion), _soundOn(true), _masterVolume(0) { @@ -537,12 +534,6 @@ void MusicEntry::doFade() { // Only process MIDI streams in this thread, not digital sound effects if (pMidiParser) { -#ifdef DISABLE_VOLUME_FADING - // Signal fading to stop... - volume = fadeTo; - fadeStep = 0; - fadeCompleted = true; -#endif pMidiParser->setVolume(volume); } |