diff options
| author | Max Horn | 2008-01-06 16:02:38 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-06 16:02:38 +0000 |
| commit | 84e5398b1cf8b1758f2b4bad916ec279f33161ca (patch) | |
| tree | 7dd0f6fbffa673ae1257341f843c1e81042d74dd | |
| parent | ab17e03fb3f6a159bbb5d81f685a0e19441f67a6 (diff) | |
| download | scummvm-rg350-84e5398b1cf8b1758f2b4bad916ec279f33161ca.tar.gz scummvm-rg350-84e5398b1cf8b1758f2b4bad916ec279f33161ca.tar.bz2 scummvm-rg350-84e5398b1cf8b1758f2b4bad916ec279f33161ca.zip | |
store the disk sounds/music were actually *loaded* from, instead of the 'current' disk
svn-id: r30310
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 51f5c76815..a92f1e0cb2 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -278,7 +278,7 @@ ImuseDigiSndMgr::SoundDesc *ImuseDigiSndMgr::allocSlot() { return NULL; } -bool ImuseDigiSndMgr::openMusicBundle(SoundDesc *sound, int disk) { +bool ImuseDigiSndMgr::openMusicBundle(SoundDesc *sound, int &disk) { bool result = false; sound->bundle = new BundleMgr(_cacheBundleDir); @@ -313,7 +313,7 @@ bool ImuseDigiSndMgr::openMusicBundle(SoundDesc *sound, int disk) { return result; } -bool ImuseDigiSndMgr::openVoiceBundle(SoundDesc *sound, int disk) { +bool ImuseDigiSndMgr::openVoiceBundle(SoundDesc *sound, int &disk) { bool result = false; sound->bundle = new BundleMgr(_cacheBundleDir); @@ -399,7 +399,7 @@ ImuseDigiSndMgr::SoundDesc *ImuseDigiSndMgr::openSound(int32 soundId, const char sound->soundId = soundId; sound->type = soundType; sound->volGroupId = volGroupId; - sound->disk = _disk; + sound->disk = disk; return sound; } else if (soundName[0] == 0) { if (sound->bundle->decompressSampleByIndex(soundId, 0, 0x2000, &ptr, 0, header_outside) == 0 || ptr == NULL) { diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index f38589df3d..dec0865689 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -110,8 +110,8 @@ private: byte _disk; BundleDirCache *_cacheBundleDir; - bool openMusicBundle(SoundDesc *sound, int disk); - bool openVoiceBundle(SoundDesc *sound, int disk); + bool openMusicBundle(SoundDesc *sound, int &disk); + bool openVoiceBundle(SoundDesc *sound, int &disk); void countElements(byte *ptr, int &numRegions, int &numJumps, int &numSyncs); |