diff options
author | Martin Kiewitz | 2010-05-27 21:20:07 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-05-27 21:20:07 +0000 |
commit | 7029b059bfa4bcff3b4be07af407f5c2cadb410b (patch) | |
tree | b77cad53fe1c50e2dba045b0dea901b65fe77c40 | |
parent | bbaf98127d95f60740ab9db304be2b9854fda9ec (diff) | |
download | scummvm-rg350-7029b059bfa4bcff3b4be07af407f5c2cadb410b.tar.gz scummvm-rg350-7029b059bfa4bcff3b4be07af407f5c2cadb410b.tar.bz2 scummvm-rg350-7029b059bfa4bcff3b4be07af407f5c2cadb410b.zip |
SCI: disabling music fading again, but only for sci32 - drivers seem to have issues when fading in on gk1/sierra logo
svn-id: r49271
-rw-r--r-- | engines/sci/sound/music.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index d8a7985288..bfa2c3b3ee 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -531,6 +531,14 @@ void MusicEntry::doFade() { fadeStep = 0; fadeCompleted = true; } +#ifdef ENABLE_SCI32 + // Disable fading for SCI32 - sound drivers have issues when fading in (gabriel knight 1 sierra title) + if (getSciVersion() >= SCI_VERSION_2) { + volume = fadeTo; + fadeStep = 0; + fadeCompleted = true; + } +#endif // Only process MIDI streams in this thread, not digital sound effects if (pMidiParser) { |