libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-07 09:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: read out vol selector on initSound/playSound for sci1early (soundversion) as well - fixes lsl1demo

Browse Source 
svn-id: r49285
This commit is contained in:
Martin Kiewitz 2010-05-28 09:29:05 +00:00
parent b0366e65e5
commit dad3ad86ea
1 changed files with 2 additions and 2 deletions

4
engines/sci/sound/soundcmd.cpp

@ -304,7 +304,7 @@ void SoundCommandParser::cmdInitSound(reg_t obj, int16 value) {
newSound->soundObj = obj; newSound->soundObj = obj;
newSound->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop)); newSound->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop));
newSound->priority = GET_SEL32V(_segMan, obj, SELECTOR(pri)) & 0xFF; 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); 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 // 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->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop));
musicSlot->priority = GET_SEL32V(_segMan, obj, SELECTOR(priority)); 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)); musicSlot->volume = GET_SEL32V(_segMan, obj, SELECTOR(vol));
_music->soundPlay(musicSlot); _music->soundPlay(musicSlot);