[Scummvm-cvs-logs] SF.net SVN: scummvm:[33846] scummvm/branches/gsoc2008-rtl

[cpage88 at users.sourceforge.net]

Revision: 33846
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33846&view=rev
Author:   cpage88
Date:     2008-08-13 20:27:39 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Fixed some memory leaks

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.cpp
    scummvm/branches/gsoc2008-rtl/engines/kyra/staticres.cpp
    scummvm/branches/gsoc2008-rtl/engines/sky/control.cpp
    scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp
    scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp
    scummvm/branches/gsoc2008-rtl/gui/launcher.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -118,8 +118,12 @@
 
 	delete[] _characterList;
 
+	delete[] _roomTable;
+
 	delete[] _movFacingTable;
 
+	delete[] _defaultShapeTable;
+
 	delete[] _gui->_scrollUpButton.data0ShapePtr;
 	delete[] _gui->_scrollUpButton.data1ShapePtr;
 	delete[] _gui->_scrollUpButton.data2ShapePtr;

Modified: scummvm/branches/gsoc2008-rtl/engines/kyra/staticres.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/kyra/staticres.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/engines/kyra/staticres.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -920,6 +920,7 @@
 	uint8 **data = (uint8**)ptr;
 	while (size--)
 		delete[] data[size];
+	delete[] data;
 	ptr = 0;
 	size = 0;
 }

Modified: scummvm/branches/gsoc2008-rtl/engines/sky/control.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sky/control.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/engines/sky/control.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -238,13 +238,17 @@
 	free(_sprites.slide2);			free(_sprites.slode);
 	free(_sprites.slode2);			free(_sprites.musicBodge);
 	delete _controlPanel;			delete _exitButton;
-	delete _slide;					delete _slide2;
-	delete _slode;					delete _restorePanButton;
+	delete _slide;				delete _slide2;
+	delete _slode;				delete _restorePanButton;
+	delete _savePanel;			delete _saveButton;
+	delete _downFastButton;			delete _downSlowButton;
+	delete _upFastButton;			delete _upSlowButton;
+	delete _quitButton;			delete _autoSaveButton;
 	delete _savePanButton;			delete _dosPanButton;
 	delete _restartPanButton;		delete _fxPanButton;
 	delete _musicPanButton;			delete _bodge;
-	delete _yesNo;					delete _text;
-	delete _statusBar;				delete _restoreButton;
+	delete _yesNo;				delete _text;
+	delete _statusBar;			delete _restoreButton;
 
 	if (_textSprite) {
 		free(_textSprite);

Modified: scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -640,9 +640,6 @@
 }
 
 Intro::~Intro(void) {
-
-	_mixer->stopAll();
-	_skyScreen->stopSequence();
 	if (_textBuf)
 		free(_textBuf);
 	if (_saveBuf)

Modified: scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -277,6 +277,8 @@
 	delete _skyDisk;
 	delete _skyControl;
 	delete _skyCompact;
+	if (_skyIntro)
+		delete _skyIntro;
 
 	for (int i = 0; i < 300; i++)
 		if (_itemList[i])
@@ -473,6 +475,7 @@
 	_systemVars.systemFlags |= SF_PLAY_VOCS;
 	_systemVars.gameSpeed = 50;
 
+	_skyIntro = 0;
 	_skyCompact = new SkyCompact();
 	_skyText = new Text(_skyDisk, _skyCompact);
 	_skyMouse = new Mouse(_system, _skyDisk, _skyCompact);

Modified: scummvm/branches/gsoc2008-rtl/gui/launcher.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-08-13 19:34:02 UTC (rev 33845)
+++ scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-08-13 20:27:39 UTC (rev 33846)
@@ -669,6 +669,7 @@
 
 LauncherDialog::~LauncherDialog() {
 	delete _browser;
+	delete _loadDialog;
 }
 
 void LauncherDialog::open() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.