From b76c0af2f4fe9cafeafdde70867e159e076b2752 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 12 Aug 2011 21:33:45 +1000
Subject: CGE: Work on implementing MIDI music playback.

Music playback is now sort of working, but it seems like only a beat track of the MIDI is getting played
---
 engines/cge/cge.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines/cge/cge.cpp')

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 6fc23969c2..cfd941017e 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -165,7 +165,7 @@ void CGEEngine::setup() {
 		_flag[i] = false;
 
 	_mode = 0;
-	_soundOk = 0;
+	_soundOk = 1;
 	_sprTv = NULL;
 	_gameCase2Cpt = 0;
 
@@ -186,6 +186,7 @@ CGEEngine::~CGEEngine() {
 	DebugMan.clearAllDebugChannels();
 
 	delete _console;
+	_midiPlayer.killMidi();
 
 	// Delete engine objects
 	delete _vga;
@@ -208,9 +209,11 @@ CGEEngine::~CGEEngine() {
 	delete _snail_;
 	delete _hero;
 
-	for (int i = 0; _miniShpList[i]; ++i)
-		delete _miniShpList[i];
-	delete[] _miniShpList;
+	if (_miniShpList) {
+		for (int i = 0; _miniShpList[i]; ++i)
+			delete _miniShpList[i];
+		delete[] _miniShpList;
+	}
 
 	freeCaveValues();
 }
-- 
cgit v1.2.3