aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-01-15 02:57:03 +0000
committerTravis Howell2006-01-15 02:57:03 +0000
commit5b6c5fc87ae8ac34b073e83452c34d1ac54c43af (patch)
treea587a8092cb4d6f30bd77bc9415c80117efbe6a6
parent1b18b98ca5d8059043db60b1c87053bfcd2cbc6f (diff)
downloadscummvm-rg350-5b6c5fc87ae8ac34b073e83452c34d1ac54c43af.tar.gz
scummvm-rg350-5b6c5fc87ae8ac34b073e83452c34d1ac54c43af.tar.bz2
scummvm-rg350-5b6c5fc87ae8ac34b073e83452c34d1ac54c43af.zip
Fix sound priority value in HE games.
svn-id: r20035
-rw-r--r--scumm/sound_he.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/scumm/sound_he.cpp b/scumm/sound_he.cpp
index fcd6df4cf8..08b95f3ac0 100644
--- a/scumm/sound_he.cpp
+++ b/scumm/sound_he.cpp
@@ -402,7 +402,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
byte *sndPtr = ptr;
int priority;
- priority = READ_LE_UINT16(ptr + 18);
+ priority = *(ptr + 18);
rate = READ_LE_UINT16(ptr + 22);
ptr += 8 + READ_BE_UINT32(ptr + 12);
@@ -433,15 +433,14 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
_overrideFreq = 0;
}
- // Bit 3 is looping related too
- if ((heFlags & 1)) {
- flags |= Audio::Mixer::FLAG_LOOP;
+ // TODO
+ if (heFlags & 1) {
+ //flags |= Audio::Mixer::FLAG_LOOP;
}
// Allocate a sound buffer, copy the data into it, and play
sound = (char *)malloc(size);
memcpy(sound, ptr + heOffset + 8, size);
- _vm->_mixer->stopHandle(_heSoundChannels[heChannel]);
_vm->_mixer->playRaw(&_heSoundChannels[heChannel], sound, size, rate, flags, soundID);
_vm->setHETimer(heChannel + 4);