libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-11 21:55:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Ignore 'combat' music in Cruader

Browse Source
This commit is contained in:
Matthew Duggan 2020-12-17 21:14:32 +09:00
parent 28d9667a9e
commit 2647bfd0a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ultima/ultima8/audio/remorse_music_process.cpp
View File

@ -108,7 +108,7 @@ void RemorseMusicProcess::playMusic(int track) {
}
void RemorseMusicProcess::playCombatMusic(int track) {
playMusic_internal(track);
// Only U8 has combat music.. ignore it.
}
void RemorseMusicProcess::queueMusic(int track) {
@ -149,7 +149,7 @@ void RemorseMusicProcess::playMusic_internal(int track) {
Audio::Mixer *mixer = Ultima8Engine::get_instance()->_mixer;
assert(mixer);
if (track == _currentTrack && mixer->isSoundHandleActive(_soundHandle))
if (track == _currentTrack && (track == 0 || mixer->isSoundHandleActive(_soundHandle)))
// Already playing what we want.
return;