[Scummvm-cvs-logs] SF.net SVN: scummvm:[35799] scummvm/trunk/engines/scumm/he/sound_he.cpp

[Kirben at users.sourceforge.net]

Revision: 35799
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35799&view=rev
Author:   Kirben
Date:     2009-01-10 10:36:01 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
Fix warning.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/sound_he.cpp

Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp	2009-01-10 10:31:39 UTC (rev 35798)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp	2009-01-10 10:36:01 UTC (rev 35799)
@@ -591,6 +591,8 @@
 		char *sound;
 		int codeOffs = -1;
 
+		priority = (soundID > _vm->_numSounds) ? 255 : *(ptr + 18);
+
 		byte *sbngPtr = findSoundTag(MKID_BE('SBNG'), ptr);
 		if (sbngPtr != NULL) {
 			codeOffs = sbngPtr - ptr + 8;
@@ -618,7 +620,7 @@
 
 		_vm->setHETimer(heChannel + 4);
 		_heChannel[heChannel].sound = soundID;
-		_heChannel[heChannel].priority = (soundID > _vm->_numSounds) ? 255 : 128;
+		_heChannel[heChannel].priority = priority;
 		_heChannel[heChannel].sbngBlock = (codeOffs != -1) ? 1 : 0;
 		_heChannel[heChannel].codeOffs = codeOffs;
 		memset(_heChannel[heChannel].soundVars, 0, sizeof(_heChannel[heChannel].soundVars));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.