[Scummvm-cvs-logs] SF.net SVN: scummvm:[48827] scummvm/trunk/engines/parallaction

[wjpalenstijn at users.sourceforge.net]

Revision: 48827
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48827&view=rev
Author:   wjpalenstijn
Date:     2010-04-28 18:50:22 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Fix a destruction order issue and note two remaining issues from the label fixes (r48811)

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/callables_ns.cpp
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/callables_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables_ns.cpp	2010-04-28 14:13:19 UTC (rev 48826)
+++ scummvm/trunk/engines/parallaction/callables_ns.cpp	2010-04-28 18:50:22 UTC (rev 48827)
@@ -416,6 +416,7 @@
 	_gfx->showLabel(labels[0], CENTER_LABEL_HORIZONTAL, 38);
 	_gfx->showLabel(labels[1], CENTER_LABEL_HORIZONTAL, 58);
 
+	// FIXME: this leaks two labels
 	return;
 }
 

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2010-04-28 14:13:19 UTC (rev 48826)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2010-04-28 18:50:22 UTC (rev 48827)
@@ -214,7 +214,10 @@
 
 Parallaction_ns::~Parallaction_ns() {
 	freeFonts();
+
+	// TODO: we may want to add a ~Character instead
 	freeCharacter();
+	_char._ani.reset();
 
 	destroyInventory();
 


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