diff options
| author | Julien Templier | 2010-11-11 14:19:44 +0000 |
|---|---|---|
| committer | Julien Templier | 2010-11-11 14:19:44 +0000 |
| commit | 521f228ceddda2cfc0ed1006682d1b7dfbca7302 (patch) | |
| tree | a2e217595367a0441480eff679b21edcfaa5368e /engines/lastexpress/entities | |
| parent | 7207d920bc2f4e01a653e0fada30698c870b9e8b (diff) | |
| download | scummvm-rg350-521f228ceddda2cfc0ed1006682d1b7dfbca7302.tar.gz scummvm-rg350-521f228ceddda2cfc0ed1006682d1b7dfbca7302.tar.bz2 scummvm-rg350-521f228ceddda2cfc0ed1006682d1b7dfbca7302.zip | |
LASTEXPRESS: Use SAFE_DELETE for class variables
svn-id: r54201
Diffstat (limited to 'engines/lastexpress/entities')
| -rw-r--r-- | engines/lastexpress/entities/entity.cpp | 2 | ||||
| -rw-r--r-- | engines/lastexpress/entities/entity.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index 6ca0155dcb..7e76123b5b 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -154,7 +154,7 @@ Entity::~Entity() { _callbacks.clear(); - delete _data; + SAFE_DELETE(_data); // Zero-out passed pointers _engine = NULL; diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index 33ca244c5e..9a2b0ffe25 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -30,6 +30,8 @@ #include "lastexpress/game/sound.h" +#include "lastexpress/helpers.h" + #include "common/array.h" #include "common/func.h" #include "common/serializer.h" @@ -493,11 +495,8 @@ public: } void clear() { - for (int i = 0; i < 4; i++) { - if (parameters[i]) - delete parameters[i]; - parameters[i] = NULL; - } + for (int i = 0; i < 4; i++) + SAFE_DELETE(parameters[i]); } // Serializable |