aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2009-12-31 12:38:17 +0000
committerMartin Kiewitz2009-12-31 12:38:17 +0000
commit3b1d4ace4097fb213e5a55b3417465318e083319 (patch)
tree1ce4c527e4f7ac1b878b19dc74875615263e4f54 /engines/sci
parentc7ea1a16138c87f0e4da3287ff9dcd049a6639fb (diff)
downloadscummvm-rg350-3b1d4ace4097fb213e5a55b3417465318e083319.tar.gz
scummvm-rg350-3b1d4ace4097fb213e5a55b3417465318e083319.tar.bz2
scummvm-rg350-3b1d4ace4097fb213e5a55b3417465318e083319.zip
SCI/new music: trigger signal when fade is completed, fixes lsl1 dance with girl
svn-id: r46798
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sfx/music.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp
index faf674406c..b745819648 100644
--- a/engines/sci/sfx/music.cpp
+++ b/engines/sci/sfx/music.cpp
@@ -372,11 +372,12 @@ void MusicEntry::doFade() {
else {
fadeTicker = fadeTickerStep;
volume += fadeStep;
+ SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan; // HACK
if (((fadeStep > 0) && (volume >= fadeTo)) || ((fadeStep < 0) && (volume <= fadeTo))) {
volume = fadeTo;
fadeStep = 0;
+ PUT_SEL32V(segMan, soundObj, signal, 0xFFFF);
}
- SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan; // HACK
PUT_SEL32V(segMan, soundObj, vol, volume);
pMidiParser->setVolume(volume);