diff options
| author | Robert Göffringmann | 2004-11-19 07:55:33 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2004-11-19 07:55:33 +0000 |
| commit | 0bda71fa39dec43d9f9e259a57bd958622c2fc2f (patch) | |
| tree | 28ae9d16766114c590dc6213e4750b567a3d6f85 /sword1/sword1.cpp | |
| parent | d173491acc2133497bc22b9728686b6b997ae505 (diff) | |
| download | scummvm-rg350-0bda71fa39dec43d9f9e259a57bd958622c2fc2f.tar.gz scummvm-rg350-0bda71fa39dec43d9f9e259a57bd958622c2fc2f.tar.bz2 scummvm-rg350-0bda71fa39dec43d9f9e259a57bd958622c2fc2f.zip | |
a little cleanup
svn-id: r15832
Diffstat (limited to 'sword1/sword1.cpp')
| -rw-r--r-- | sword1/sword1.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 0b67ba75be..1e56aa0944 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -29,7 +29,6 @@ #include "common/file.h" #include "common/timer.h" -#include "sword1/memman.h" #include "sword1/resman.h" #include "sword1/objectman.h" #include "sword1/mouse.h" @@ -121,10 +120,7 @@ SwordEngine::~SwordEngine() { delete _screen; delete _mouse; delete _objectMan; - _resMan->flush(); // free all memory - _memMan->flush(); delete _resMan; - delete _memMan; } void SwordEngine::initialize(void) { @@ -140,10 +136,8 @@ void SwordEngine::initialize(void) { File::addDefaultDirectory(_gameDataPath + "video/"); _system->initSize(640, 480); - debug(5, "Starting memory manager"); - _memMan = new MemMan(); debug(5, "Starting resource manager"); - _resMan = new ResMan("swordres.rif", _memMan); + _resMan = new ResMan("swordres.rif"); debug(5, "Starting object manager"); _objectMan = new ObjectMan(_resMan); _mixer->setVolume(255); @@ -207,8 +201,7 @@ void SwordEngine::initialize(void) { } void SwordEngine::reinitialize(void) { - _resMan->flush(); // free everything that's currently alloced and opened. - _memMan->flush(); // Handle with care. + _resMan->flush(); // free everything that's currently alloced and opened. (*evil*) _logic->initialize(); // now reinitialize these objects as they (may) have locked _objectMan->initialize(); // resources which have just been wiped. |