From 5797182aa23d38cd024f9ccf5912339ac675569d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 22 Jun 2014 16:53:51 +0200
Subject: SCUMM: Do not let music reallocate its own channels in AD player.

This makes it conform to the original.
---
 engines/scumm/players/player_ad.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp
index ba75bdd922..adcda68e10 100644
--- a/engines/scumm/players/player_ad.cpp
+++ b/engines/scumm/players/player_ad.cpp
@@ -316,7 +316,9 @@ int Player_AD::allocateHWChannel(int priority, SfxSlot *owner) {
 		// We don't allow SFX to reallocate their own channels. Otherwise we
 		// would call stopSfx in the midst of startSfx and that can lead to
 		// horrible states...
-		if (_hwChannels[i].priority <= minPrio && (!owner || _hwChannels[i].sfxOwner != owner)) {
+		// We also prevent the music from reallocating its own channels like
+		// in the original.
+		if (_hwChannels[i].priority <= minPrio && _hwChannels[i].sfxOwner != owner) {
 			minPrio = _hwChannels[i].priority;
 			channel = i;
 		}
-- 
cgit v1.2.3