OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 6 insertions, 6 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index c5841ff05e..0c8e6dd63c 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -561,11 +561,11 @@ Common::Error AGOSEngine::init() {
 
 		_driver = MidiDriver::createMidi(dev);
 
-		if (_nativeMT32) {
+		if (_nativeMT32)
 			_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
-		}
 
-		_midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_nativeMT32);
+		_midi.setNativeMT32(_nativeMT32);
+		_midi.mapMT32toGM(getGameType() != GType_SIMON2 && !_nativeMT32);
 
 		_midi.setDriver(_driver);
 
@@ -925,10 +925,10 @@ AGOSEngine::~AGOSEngine() {
 	free(_textMem);
 	free(_xtblList);
 
-	free(_backGroundBuf);
-	free(_backBuf);
+	delete _backGroundBuf;
+	delete _backBuf;
 	free(_planarBuf);
-	free(_scaleBuf);
+	delete _scaleBuf;
 	free(_zoneBuffers);
 
 	free(_window4BackScn);