From b1a8067d64cafb5f89a790c4a82066cb31fcbc74 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Thu, 8 May 2008 18:39:13 +0000 Subject: Reordering game parts deinitialization, to avoid having one part's destructor access an already destroyed part svn-id: r31952 --- engines/gob/gob.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/gob') diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 951f331cbe..ed2fe0fc15 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -382,12 +382,12 @@ bool GobEngine::initGameParts() { } void GobEngine::deinitGameParts() { + delete _saveLoad; _saveLoad = 0; delete _mult; _mult = 0; + delete _vidPlayer; _vidPlayer = 0; delete _game; _game = 0; delete _global; _global = 0; - delete _dataIO; _dataIO = 0; delete _goblin; _goblin = 0; - delete _vidPlayer; _vidPlayer = 0; delete _init; _init = 0; delete _inter; _inter = 0; delete _map; _map = 0; @@ -397,8 +397,8 @@ void GobEngine::deinitGameParts() { delete _draw; _draw = 0; delete _util; _util = 0; delete _video; _video = 0; - delete _saveLoad; _saveLoad = 0; delete _sound; _sound = 0; + delete _dataIO; _dataIO = 0; } } // End of namespace Gob -- cgit v1.2.3