diff options
| author | Paweł Kołodziejski | 2008-01-14 21:42:39 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2008-01-14 21:42:39 +0000 |
| commit | 8ada12d3d8f47e122e6ce5bb7d2d01230aa6b9a4 (patch) | |
| tree | f69552db48c805d1de3e85256c77f0e52868380b /engines | |
| parent | 6992238026e7459207b83b280e1420a7eea4ab0c (diff) | |
| download | scummvm-rg350-8ada12d3d8f47e122e6ce5bb7d2d01230aa6b9a4.tar.gz scummvm-rg350-8ada12d3d8f47e122e6ce5bb7d2d01230aa6b9a4.tar.bz2 scummvm-rg350-8ada12d3d8f47e122e6ce5bb7d2d01230aa6b9a4.zip | |
revert last experimental dimuse change, force flush
svn-id: r30488
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 5063f36f3e..984bb3b6f4 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -328,8 +328,8 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel } if (_track[track->trackId + MAX_DIGITAL_TRACKS]->used) { - warning("IMuseDigital::cloneToFadeOutTrack: No free fade track, force flush"); - flushTrack(_track[track->trackId + MAX_DIGITAL_TRACKS]); + warning("IMuseDigital::cloneToFadeOutTrack: No free fade track"); + return NULL; } fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS]; |