diff options
| author | Sven Hesse | 2008-05-08 18:39:13 +0000 |
|---|---|---|
| committer | Sven Hesse | 2008-05-08 18:39:13 +0000 |
| commit | b1a8067d64cafb5f89a790c4a82066cb31fcbc74 (patch) | |
| tree | 16f868bc9910ea5ef0075e476807c7c11ceb7ff6 /engines/gob | |
| parent | cb34952e034df6869489ba261845c2c83d48d5bf (diff) | |
| download | scummvm-rg350-b1a8067d64cafb5f89a790c4a82066cb31fcbc74.tar.gz scummvm-rg350-b1a8067d64cafb5f89a790c4a82066cb31fcbc74.tar.bz2 scummvm-rg350-b1a8067d64cafb5f89a790c4a82066cb31fcbc74.zip | |
Reordering game parts deinitialization, to avoid having one part's destructor access an already destroyed part
svn-id: r31952
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/gob.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 |