diff options
| author | Martin Kiewitz | 2010-07-09 18:35:46 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-09 18:35:46 +0000 |
| commit | 3fe205ba7f376bcc7f4f87226b61918acb9ce925 (patch) | |
| tree | 7779df4d2e8bc7a78b327317a723b722f01eae2a /engines/sci/sound | |
| parent | 18d1ab8c709602d71ad4175c29d4517f1bc5bbab (diff) | |
| download | scummvm-rg350-3fe205ba7f376bcc7f4f87226b61918acb9ce925.tar.gz scummvm-rg350-3fe205ba7f376bcc7f4f87226b61918acb9ce925.tar.bz2 scummvm-rg350-3fe205ba7f376bcc7f4f87226b61918acb9ce925.zip | |
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
Diffstat (limited to 'engines/sci/sound')
| -rw-r--r-- | engines/sci/sound/music.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |