[Scummvm-cvs-logs] SF.net SVN: scummvm: [20719] scummvm/trunk/engines/scumm/he/sound_he.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Wed Feb 15 21:56:00 CET 2006
Revision: 20719
Author: kirben
Date: 2006-02-15 21:55:44 -0800 (Wed, 15 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20719&view=rev
Log Message:
-----------
Stop current music in HE60/61 games, before starting new music
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-02-16 05:52:39 UTC (rev 20718)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp 2006-02-16 05:55:44 UTC (rev 20719)
@@ -499,8 +499,10 @@
_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
}
else if (READ_UINT32(ptr) == MKID('MIDI')) {
- if (_vm->_musicEngine) {
- _vm->_musicEngine->startSound(soundID);
+ if (_vm->_imuse) {
+ _vm->_imuse->stopSound(_currentMusic);
+ _currentMusic = soundID;
+ _vm->_imuse->startSound(soundID);
}
}
}
More information about the Scummvm-git-logs
mailing list