aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-01-08 01:59:11 +0000
committerMax Horn2004-01-08 01:59:11 +0000
commitf224da09f4ae85ededff2b63734d375b20451dcc (patch)
tree8f2cf7a079ad51bc1214f742d687d793405a23a1
parenta65552794924ce2c86ad017854c56b6a926573d0 (diff)
downloadscummvm-rg350-f224da09f4ae85ededff2b63734d375b20451dcc.tar.gz
scummvm-rg350-f224da09f4ae85ededff2b63734d375b20451dcc.tar.bz2
scummvm-rg350-f224da09f4ae85ededff2b63734d375b20451dcc.zip
fix a memory leak; re-add assert, just to be sure
svn-id: r12230
-rw-r--r--scumm/imuse_digi/dimuse.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index bcb4f89d0d..9944cd427f 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -175,6 +175,7 @@ void IMuseDigital::callback() {
break;
}
mixer_size -= result;
+ assert(mixer_size >= 0);
} while (mixer_size != 0);
}
}
@@ -278,7 +279,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
} else {
_track[l].stream2 = NULL;
_track[l].stream = makeAppendableAudioStream(freq, mixerFlags, 100000);
- _scumm->_mixer->playInputStream(&_track[l].handle, _track[l].stream, true, _track[l].vol / 1000, _track[l].pan, -1, false);
+ _scumm->_mixer->playInputStream(&_track[l].handle, _track[l].stream, true, _track[l].vol / 1000, _track[l].pan, -1);
}
_track[l].used = true;