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

[aquadran at users.sourceforge.net]

Revision: 30541
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30541&view=rev
Author:   aquadran
Date:     2008-01-17 14:55:22 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
restore TrackId meaning

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-17 22:32:27 UTC (rev 30540)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-17 22:55:22 UTC (rev 30541)
@@ -158,13 +158,14 @@
 		}
 		ser->saveLoadEntries(track, trackEntries);
 		if (ser->isLoading()) {
+			_track[l]->trackId = l;
 			if (!track->used)
 				continue;
 			if ((track->toBeRemoved) || (track->souStreamUsed) || (track->curRegion == -1)) {
 				track->used = false;
 				continue;
 			}
-			
+
 			// TODO: The code below has a lot in common with that in IMuseDigital::startSound.
 			// Try to refactor them to reduce the code duplication.
 

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-17 22:32:27 UTC (rev 30540)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-17 22:55:22 UTC (rev 30541)
@@ -341,6 +341,7 @@
 		return NULL;
 	}
 
+	assert(track->trackId < 8);
 	fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS];
 
 	if (fadeTrack->used) {


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