[Scummvm-cvs-logs] SF.net SVN: scummvm: [21019] scummvm/trunk/engines/scumm/he/sound_he.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Thu Mar 2 16:46:02 CET 2006
Revision: 21019
Author: kirben
Date: 2006-03-02 16:45:27 -0800 (Thu, 02 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=21019&view=rev
Log Message:
-----------
Always use music sound type, for music in 3DO versions of HE games
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 2006-03-02 23:31:28 UTC (rev 21018)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp 2006-03-03 00:45:27 UTC (rev 21019)
@@ -336,10 +336,10 @@
byte flags = Audio::Mixer::FLAG_UNSIGNED;
Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType;
- if (soundID == 1)
+ if (soundID > _vm->_numSounds)
+ type = Audio::Mixer::kMusicSoundType;
+ else if (soundID == 1)
type = Audio::Mixer::kSpeechSoundType;
- else if (soundID > _vm->_numSounds)
- type = Audio::Mixer::kMusicSoundType;
if (heChannel == -1)
@@ -492,7 +492,7 @@
_vm->_mixer->stopID(_currentMusic);
_currentMusic = soundID;
- _vm->_mixer->playRaw(NULL, ptr + 8, size, rate, flags, soundID, 255, 0, 0,0, type);
+ _vm->_mixer->playRaw(NULL, ptr + 8, size, rate, flags, soundID, 255, 0, 0,0, Audio::Mixer::kMusicSoundType);
}
else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
if (_vm->_imuse) {
More information about the Scummvm-git-logs
mailing list