TOON: More corrections to close memory leaks.

These corrections close a number of leaks in the Toon engine reported by running Valgrind with --leak-check=full option, but a significant number still remain.

svn-id: r54176

1 files changed, 7 insertions, 8 deletions

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index 386d00ef77..592d1a7388 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -208,10 +208,8 @@ void AudioManager::stopCurrentVoice() {
 
 
 void AudioManager::closeAudioPack(int32 id) {
-	if(_audioPacks[id]) {
-		delete _audioPacks[id];
-		_audioPacks[id] = 0;
-	}
+	delete _audioPacks[id];
+	_audioPacks[id] = NULL;
 }
 
 bool AudioManager::loadAudioPack(int32 id, Common::String indexFile, Common::String packFile) {
@@ -239,10 +237,6 @@ void AudioManager::stopMusic() {
 	if (_channels[1])
 		_channels[1]->stop(true);
 }
-AudioStreamInstance::~AudioStreamInstance() {
-	if (_man)
-		_man->removeInstance(this);
-}
 
 AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer, Common::SeekableReadStream *stream , bool looping) {
 	_compBufferSize = 0;
@@ -274,6 +268,11 @@ AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer,
 	}
 }
 
+AudioStreamInstance::~AudioStreamInstance() {
+	if (_man)
+		_man->removeInstance(this);
+}
+
 int AudioStreamInstance::readBuffer(int16 *buffer, const int numSamples) {
 	debugC(5, kDebugAudio, "readBuffer(buffer, %d)", numSamples);