[Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,2.9,2.10

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3145/scumm

Modified Files:
	sound_he.cpp 
Log Message:

Fix sound priority value in HE games.


Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- sound_he.cpp	14 Jan 2006 04:29:30 -0000	2.9
+++ sound_he.cpp	15 Jan 2006 02:57:04 -0000	2.10
@@ -402,7 +402,7 @@
 		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 @@
 			_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);