diff options
| author | Martin Kiewitz | 2010-05-28 09:29:05 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-28 09:29:05 +0000 |
| commit | dad3ad86eac7954f0e5e1932b628c68d22e890a8 (patch) | |
| tree | 2feb2f32415b0b0ff7a4430008171ce117f4a81a | |
| parent | b0366e65e593c2b4fa6b5999a5558508d80883f7 (diff) | |
| download | scummvm-rg350-dad3ad86eac7954f0e5e1932b628c68d22e890a8.tar.gz scummvm-rg350-dad3ad86eac7954f0e5e1932b628c68d22e890a8.tar.bz2 scummvm-rg350-dad3ad86eac7954f0e5e1932b628c68d22e890a8.zip | |
SCI: read out vol selector on initSound/playSound for sci1early (soundversion) as well - fixes lsl1demo
svn-id: r49285
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 45d9302354..b191e9f2c0 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -304,7 +304,7 @@ void SoundCommandParser::cmdInitSound(reg_t obj, int16 value) { newSound->soundObj = obj; newSound->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop)); newSound->priority = GET_SEL32V(_segMan, obj, SELECTOR(pri)) & 0xFF; - if (_soundVersion >= SCI_VERSION_1_LATE) + if (_soundVersion >= SCI_VERSION_1_EARLY) newSound->volume = CLIP<int>(GET_SEL32V(_segMan, obj, SELECTOR(vol)), 0, MUSIC_VOLUME_MAX); // In SCI1.1 games, sound effects are started from here. If we can find @@ -440,7 +440,7 @@ void SoundCommandParser::cmdPlaySound(reg_t obj, int16 value) { musicSlot->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop)); musicSlot->priority = GET_SEL32V(_segMan, obj, SELECTOR(priority)); - if (_soundVersion >= SCI_VERSION_1_LATE) + if (_soundVersion >= SCI_VERSION_1_EARLY) musicSlot->volume = GET_SEL32V(_segMan, obj, SELECTOR(vol)); _music->soundPlay(musicSlot); |