aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities/entity.cpp
diff options
context:
space:
mode:
authorJulien Templier2010-11-11 06:18:23 +0000
committerJulien Templier2010-11-11 06:18:23 +0000
commit6711c5a8cf48c579bb4b972d4717fb6f1a394320 (patch)
tree546bb986c01d19c9a375dda3a17341e1fe2d906a /engines/lastexpress/entities/entity.cpp
parentda33617061d3d35becaaa741c8144377bf40f39b (diff)
downloadscummvm-rg350-6711c5a8cf48c579bb4b972d4717fb6f1a394320.tar.gz
scummvm-rg350-6711c5a8cf48c579bb4b972d4717fb6f1a394320.tar.bz2
scummvm-rg350-6711c5a8cf48c579bb4b972d4717fb6f1a394320.zip
LASTEXPRESS: Fix more memory leaks
- Missing deallocation of queued frames in SceneManager - Leaking functor on each call to entity setup functions - Add SoundEntry destructor & better Entity cleanup as reported by digitall svn-id: r54196
Diffstat (limited to 'engines/lastexpress/entities/entity.cpp')
-rw-r--r--engines/lastexpress/entities/entity.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 3291b49e9b..6ca0155dcb 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -150,7 +150,9 @@ Entity::Entity(LastExpressEngine *engine, EntityIndex index) : _engine(engine),
Entity::~Entity() {
for (uint i = 0; i < _callbacks.size(); i++)
- delete _callbacks[i];
+ SAFE_DELETE(_callbacks[i]);
+
+ _callbacks.clear();
delete _data;