[Scummvm-cvs-logs] CVS: scummvm/bs2 resman.cpp,1.16,1.17

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv14628

Modified Files:
	resman.cpp 
Log Message:
Another attempt at fixing the music1.clu / music2.clu thing.


Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- resman.cpp	31 Aug 2003 18:09:21 -0000	1.16
+++ resman.cpp	1 Sep 2003 06:40:07 -0000	1.17
@@ -346,7 +346,13 @@
 		}
 */
 
-		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)