diff options
| author | Torbjörn Andersson | 2003-09-01 06:40:07 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-01 06:40:07 +0000 |
| commit | 178b0d82dfcdb923b2835465d87f75ed9271bd1d (patch) | |
| tree | 9288b518d628922c0ccd863a91452f5ecae98f8f | |
| parent | 56ca9f03df72d074ca67197390f8f13df13cb607 (diff) | |
| download | scummvm-rg350-178b0d82dfcdb923b2835465d87f75ed9271bd1d.tar.gz scummvm-rg350-178b0d82dfcdb923b2835465d87f75ed9271bd1d.tar.bz2 scummvm-rg350-178b0d82dfcdb923b2835465d87f75ed9271bd1d.zip | |
Another attempt at fixing the music1.clu / music2.clu thing.
svn-id: r9952
| -rw-r--r-- | sword2/resman.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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) |