[Scummvm-cvs-logs] SF.net SVN: scummvm:[47884] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 47884
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47884&view=rev
Author:   m_kiewitz
Date:     2010-02-04 19:33:36 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
SCI: cleaning up deleting of graphic objects

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/gui.cpp
    scummvm/trunk/engines/sci/graphics/gui32.cpp
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-02-04 19:22:40 UTC (rev 47883)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-02-04 19:33:36 UTC (rev 47884)
@@ -72,11 +72,9 @@
 	delete _controls;
 	delete _text16;
 	delete _animate;
-	delete _transitions;
 	delete _paint16;
-	delete _ports;
+	delete _transitions;
 	delete _compare;
-	delete _cache;
 }
 
 void SciGui::resetEngineState(EngineState *s) {

Modified: scummvm/trunk/engines/sci/graphics/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-02-04 19:22:40 UTC (rev 47883)
+++ scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-02-04 19:33:36 UTC (rev 47884)
@@ -55,8 +55,9 @@
 }
 
 SciGui32::~SciGui32() {
+	delete _frameout;
+	delete _paint32;
 	delete _compare;
-	delete _cache;
 }
 
 void SciGui32::resetEngineState(EngineState *s) {

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-02-04 19:22:40 UTC (rev 47883)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-02-04 19:33:36 UTC (rev 47884)
@@ -250,11 +250,14 @@
 
 	delete _gamestate->_soundCmd;
 	delete _gamestate->_gui;
+	delete _gamestate->_gui32;
+	delete _gamestate->_gfxPorts;
+	delete _gamestate->_gfxCache;
+	delete _gamestate->_gfxPalette;
+	delete cursor;
+	delete _gamestate->_gfxScreen;
 	delete _gamestate->_event;
 	delete segMan;
-	delete cursor;
-	delete palette;
-	delete screen;
 	delete _gamestate;
 
 	return Common::kNoError;


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