diff options
| author | Max Horn | 2007-03-20 19:40:34 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-20 19:40:34 +0000 |
| commit | abf59db15e375b34a75e1bf637982a267b9ecce9 (patch) | |
| tree | 1a96835ef1013d0f73a8011e36ef4317dddd3a30 /engines/scumm | |
| parent | 3d52e20b9b0519a2d9cbe3673ae6a16417a9598a (diff) | |
| download | scummvm-rg350-abf59db15e375b34a75e1bf637982a267b9ecce9.tar.gz scummvm-rg350-abf59db15e375b34a75e1bf637982a267b9ecce9.tar.bz2 scummvm-rg350-abf59db15e375b34a75e1bf637982a267b9ecce9.zip | |
Make sure Track::soundHandle is always initialize, and added a FIXME (see also bug #1635361)
svn-id: r26259
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 968f01c9e8..a3ff3927fe 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -114,6 +114,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->iteration = 0; track->souStream = true; track->soundName[0] = 0; + track->soundHandle = NULL; } else { track->souStream = false; strcpy(track->soundName, soundName); @@ -323,6 +324,8 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(const Track *track, int f memcpy(fadeTrack, track, sizeof(Track)); // Clone the soundhandle + // FIXME: Shouldn't we check here whether track->soundHandle is NULL, resp. whether stream2 + // is being used (as in, we are using compressed data)... fadeTrack->soundHandle = _sound->cloneSound(track->soundHandle); assert(fadeTrack->soundHandle); |