aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-01-29 16:45:30 +0100
committerWillem Jan Palenstijn2013-01-29 20:55:40 +0100
commite37be9f5355f58bf8b0852d13c8d81e3c55ff8d2 (patch)
tree28143f66e7a02889328a5a02a0a7c7ca37c5aed3
parent2f73d64e803c3be97d20bdbd1c4c482e783eb3d6 (diff)
downloadscummvm-rg350-e37be9f5355f58bf8b0852d13c8d81e3c55ff8d2.tar.gz
scummvm-rg350-e37be9f5355f58bf8b0852d13c8d81e3c55ff8d2.tar.bz2
scummvm-rg350-e37be9f5355f58bf8b0852d13c8d81e3c55ff8d2.zip
SCI: Use correct priority selector in SoundCmd
It was using 'pri' instead of 'priority', apparently due to a selector number->name translation error from 544daa5c31. Thanks to waltervn for spotting this.
-rw-r--r--engines/sci/sound/soundcmd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 7782ab4e48..a76b3b3876 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -116,7 +116,7 @@ void SoundCommandParser::processInitSound(reg_t obj) {
newSound->resourceId = resourceId;
newSound->soundObj = obj;
newSound->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
- newSound->priority = readSelectorValue(_segMan, obj, SELECTOR(pri)) & 0xFF;
+ newSound->priority = readSelectorValue(_segMan, obj, SELECTOR(priority)) & 0xFF;
if (_soundVersion >= SCI_VERSION_1_EARLY)
newSound->volume = CLIP<int>(readSelectorValue(_segMan, obj, SELECTOR(vol)), 0, MUSIC_VOLUME_MAX);
newSound->reverb = -1; // initialize to SCI invalid, it'll be set correctly in soundInitSnd() below
@@ -441,7 +441,7 @@ reg_t SoundCommandParser::kDoSoundUpdate(int argc, reg_t *argv, reg_t acc) {
int16 objVol = CLIP<int>(readSelectorValue(_segMan, obj, SELECTOR(vol)), 0, 255);
if (objVol != musicSlot->volume)
_music->soundSetVolume(musicSlot, objVol);
- uint32 objPrio = readSelectorValue(_segMan, obj, SELECTOR(pri));
+ uint32 objPrio = readSelectorValue(_segMan, obj, SELECTOR(priority));
if (objPrio != musicSlot->priority)
_music->soundSetPriority(musicSlot, objPrio);
return acc;