From 2647bfd0a8680809c4708dc59fde8318cb3f7dff Mon Sep 17 00:00:00 2001
From: Matthew Duggan <mgithub@guarana.org>
Date: Thu, 17 Dec 2020 21:14:32 +0900
Subject: [PATCH] ULTIMA8: Ignore 'combat' music in Cruader

---
 engines/ultima/ultima8/audio/remorse_music_process.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/ultima/ultima8/audio/remorse_music_process.cpp b/engines/ultima/ultima8/audio/remorse_music_process.cpp
index aeb39a4dcc8..c817ea69db2 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.cpp
+++ b/engines/ultima/ultima8/audio/remorse_music_process.cpp
@@ -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;