From 7029b059bfa4bcff3b4be07af407f5c2cadb410b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 27 May 2010 21:20:07 +0000
Subject: SCI: disabling music fading again, but only for sci32 - drivers seem
 to have issues when fading in on gk1/sierra logo

svn-id: r49271
---
 engines/sci/sound/music.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'engines/sci')

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) {
-- 
cgit v1.2.3