[Scummvm-cvs-logs] SF.net SVN: scummvm:[49476] scummvm/trunk/engines/m4/m4.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Mon Jun 7 11:06:06 CEST 2010


Revision: 49476
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49476&view=rev
Author:   dreammaster
Date:     2010-06-07 09:06:06 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
Moved destruction of globals and resource manager to common M4 engine base class - this fixes a bug where resources were still being tossed after the resource manager was destroyed

Modified Paths:
--------------
    scummvm/trunk/engines/m4/m4.cpp

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-06-07 03:25:24 UTC (rev 49475)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-06-07 09:06:06 UTC (rev 49476)
@@ -146,6 +146,8 @@
 	delete _ws;
 	delete _random;
 	delete _palette;
+	delete _globals;
+	delete _resourceManager;
 }
 
 Common::Error MadsM4Engine::run() {
@@ -303,8 +305,6 @@
 }
 
 M4Engine::~M4Engine() {
-	delete _resourceManager;
-	delete _globals;
 	delete _converse;
 }
 
@@ -500,8 +500,6 @@
 }
 
 MadsEngine::~MadsEngine() {
-	delete _globals;
-	delete _resourceManager;
 }
 
 Common::Error MadsEngine::run() {


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