[Scummvm-cvs-logs] SF.net SVN: scummvm: [23288] scummvm/branches/branch-0-9-0/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Jun 24 14:06:19 CEST 2006


Revision: 23288
Author:   lordhoto
Date:     2006-06-24 05:06:13 -0700 (Sat, 24 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23288&view=rev

Log Message:
-----------
Backporting _saveFileMan memory leak fix from Fingolfin.

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/engines/kyra/kyra.cpp
    scummvm/branches/branch-0-9-0/engines/kyra/kyra.h
Modified: scummvm/branches/branch-0-9-0/engines/kyra/kyra.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/kyra/kyra.cpp	2006-06-24 12:03:30 UTC (rev 23287)
+++ scummvm/branches/branch-0-9-0/engines/kyra/kyra.cpp	2006-06-24 12:06:13 UTC (rev 23288)
@@ -85,7 +85,6 @@
 	_screen = 0;
 	_res = 0;
 	_sound = 0;
-	_saveFileMan = 0;
 	_seq = 0;
 	_scriptInterpreter = 0;
 	_text = 0;
@@ -178,8 +177,6 @@
 	}
 	_sound->setVolume(255);
 	
-	_saveFileMan = _system->getSavefileManager();
-	assert(_saveFileMan);	
 	_res = new Resource(this);
 	assert(_res);
 	_screen = new Screen(this, _system);
@@ -347,7 +344,6 @@
 	delete _screen;
 	delete _res;
 	delete _sound;
-	delete _saveFileMan;
 	delete _seq;
 	delete _scriptInterpreter;
 	delete _text;

Modified: scummvm/branches/branch-0-9-0/engines/kyra/kyra.h
===================================================================
--- scummvm/branches/branch-0-9-0/engines/kyra/kyra.h	2006-06-24 12:03:30 UTC (rev 23287)
+++ scummvm/branches/branch-0-9-0/engines/kyra/kyra.h	2006-06-24 12:06:13 UTC (rev 23288)
@@ -813,7 +813,6 @@
 	ScriptHelper *_scriptInterpreter;
 	Debugger *_debugger;
 	StaticResource *_staticres;
-	Common::SaveFileManager *_saveFileMan;
 
 	ScriptState *_scriptMain;
 	


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





More information about the Scummvm-git-logs mailing list