From 3fe205ba7f376bcc7f4f87226b61918acb9ce925 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Fri, 9 Jul 2010 18:35:46 +0000 Subject: SCI: fixing regression of r50414 - we set volume to standard levels inside initCommands since then, so if we set the actual needed volume before calling that it will get ignored - fixes lsl1demo svn-id: r50766 --- engines/sci/sound/music.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/sci/sound') diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index cf084f81eb..55a7e1fdc4 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -374,9 +374,10 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { _mutex.lock(); pSnd->pMidiParser->mainThreadBegin(); pSnd->pMidiParser->tryToOwnChannels(); + if (pSnd->status == kSoundStopped) + pSnd->pMidiParser->sendInitCommands(); pSnd->pMidiParser->setVolume(pSnd->volume); if (pSnd->status == kSoundStopped) { - pSnd->pMidiParser->sendInitCommands(); pSnd->pMidiParser->jumpToTick(0); } else { // Fast forward to the last position and perform associated events when loading -- cgit v1.2.3