[Scummvm-cvs-logs] SF.net SVN: scummvm:[55618] scummvm/trunk/engines/kyra

[tdhs at users.sourceforge.net]

Revision: 55618
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55618&view=rev
Author:   tdhs
Date:     2011-01-29 18:18:29 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
KYRA: Close Memory Leaks in Kyra 3 (Malcolm's Revenge) Menu.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_mr.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2011-01-29 16:19:55 UTC (rev 55617)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2011-01-29 18:18:29 UTC (rev 55618)
@@ -121,6 +121,7 @@
 	_curDlgChapter = _curDlgIndex = _curDlgLang = -1;
 	_isStartupDialog = 0;
 	_stringBuffer = 0;
+	_menuAnim = 0;
 	_dialogSceneAnim = _dialogSceneScript = -1;
 	memset(&_dialogScriptData, 0, sizeof(_dialogScriptData));
 	memset(&_dialogScriptState, 0, sizeof(_dialogScriptState));
@@ -155,6 +156,9 @@
 	delete _screen;
 	delete _soundDigital;
 
+	delete _menuAnim;
+	_menuAnim = 0;
+
 	delete[] _itemBuffer1;
 	delete[] _itemBuffer2;
 	delete[] _scoreFile;

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2011-01-29 16:19:55 UTC (rev 55617)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2011-01-29 18:18:29 UTC (rev 55618)
@@ -74,6 +74,8 @@
 
 	_pauseStart = 0;
 
+	_menu = 0;
+
 	_lang = 0;
 	Common::Language lang = Common::parseLanguage(ConfMan.get("language"));
 	if (lang == _flags.fanLang && _flags.replacedLang != Common::UNK_LANG)
@@ -118,6 +120,9 @@
 
 	_emc->unload(&_sceneScriptData);
 
+	delete _menu;
+	_menu = 0;
+
 	delete[] _animObjects;
 
 	for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)


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