[Scummvm-cvs-logs] SF.net SVN: scummvm: [30310] scummvm/trunk/engines/scumm/imuse_digi

[fingolfin at users.sourceforge.net]

Revision: 30310
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30310&view=rev
Author:   fingolfin
Date:     2008-01-06 08:02:38 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
store the disk sounds/music were actually *loaded* from, instead of the 'current' disk

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2008-01-06 15:02:46 UTC (rev 30309)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2008-01-06 16:02:38 UTC (rev 30310)
@@ -278,7 +278,7 @@
 	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 @@
 	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 @@
 			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) {

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h	2008-01-06 15:02:46 UTC (rev 30309)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h	2008-01-06 16:02:38 UTC (rev 30310)
@@ -110,8 +110,8 @@
 	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);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.