[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_draw.cpp,1.53,1.54 d_sound.cpp,1.98,1.99

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv19039/driver

Modified Files:
	d_draw.cpp d_sound.cpp 
Log Message:
Valgrind fixes. Mostly about memory not being freed when the engine is
deleted.


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- d_draw.cpp	6 Jan 2004 13:44:17 -0000	1.53
+++ d_draw.cpp	7 Jan 2004 07:42:00 -0000	1.54
@@ -66,6 +66,13 @@
 Graphics::~Graphics() {
 	free(_buffer);
 	free(_dirtyGrid);
+	closeBackgroundLayer();
+	free(_lightMask);
+	free(_mouseAnim);
+	free(_luggageAnim);
+	for (int i = 0; i < 2; i++)
+		for (int j = 0; j < RDMENU_MAXPOCKETS; j++)
+			free(_icons[i][j]);
 }
 
 /**

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- d_sound.cpp	6 Jan 2004 13:44:17 -0000	1.98
+++ d_sound.cpp	7 Jan 2004 07:42:00 -0000	1.99
@@ -77,6 +77,9 @@
 
 Sound::~Sound() {
 	_vm->_mixer->setupPremix(0, 0);
+	delete _converter;
+	for (int i = 0; i < MAXFX; i++)
+		stopFxHandle(i);
 	if (_mutex)
 		_vm->_system->delete_mutex(_mutex);
 }