From 178b0d82dfcdb923b2835465d87f75ed9271bd1d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 1 Sep 2003 06:40:07 +0000
Subject: Another attempt at fixing the music1.clu / music2.clu thing.

svn-id: r9952
---
 sword2/resman.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 913e620b27..dd9d9769bf 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -346,7 +346,13 @@ uint8	*resMan::Res_open( uint32 res )	//BHTony30May96
 		}
 */
 
-		curCd = cdTab[parent_res_file] & 3;
+		// If we're loading a cluster that's only available from one
+		// of the CDs, remember which one so that we can play the
+		// correct music.
+
+		if (!(cdTab[parent_res_file] & LOCAL_PERM)) {
+			curCd = cdTab[parent_res_file] & 3;
+		}
 
 		//open the cluster file
 		if (file.open(resource_files[parent_res_file], g_sword2->getGameDataPath()) == false) 
-- 
cgit v1.2.3