thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r49476
This commit is contained in:
Paul Gilbert 2010-06-07 09:06:06 +00:00
parent d30d57b923
commit 1572524b64
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/m4/m4.cpp
View file

@ -146,6 +146,8 @@ MadsM4Engine::~MadsM4Engine() {
delete _ws; delete _ws;
delete _random; delete _random;
delete _palette; delete _palette;
delete _globals;
delete _resourceManager;
} }
Common::Error MadsM4Engine::run() { Common::Error MadsM4Engine::run() {
@ -303,8 +305,6 @@ M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engi
} }
M4Engine::~M4Engine() { M4Engine::~M4Engine() {
delete _resourceManager;
delete _globals;
delete _converse; delete _converse;
} }
@ -500,8 +500,6 @@ MadsEngine::MadsEngine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4
} }
MadsEngine::~MadsEngine() { MadsEngine::~MadsEngine() {
delete _globals;
delete _resourceManager;
} }
Common::Error MadsEngine::run() { Common::Error MadsEngine::run() {