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/game/sound.cpp | |
| 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/game/sound.cpp')
| -rw-r--r-- | engines/lastexpress/game/sound.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp index 2249109fe9..b28583f729 100644 --- a/engines/lastexpress/game/sound.cpp +++ b/engines/lastexpress/game/sound.cpp @@ -118,9 +118,12 @@ SoundManager::SoundManager(LastExpressEngine *engine) : _engine(engine), _state( } SoundManager::~SoundManager() { + for (Common::List<SoundEntry *>::iterator i = _cache.begin(); i != _cache.end(); ++i) + SAFE_DELETE(*i); + _cache.clear(); - delete _soundStream; + SAFE_DELETE(_soundStream); // Zero passed pointers _engine = NULL; @@ -134,6 +137,7 @@ void SoundManager::handleTimer() { for (Common::List<SoundEntry *>::iterator i = _cache.begin(); i != _cache.end(); ++i) { SoundEntry *entry = (*i); if (entry->stream == NULL) { + SAFE_DELETE(*i); i = _cache.reverse_erase(i); continue; } else if (!entry->isStreamed) { @@ -191,7 +195,7 @@ void SoundManager::clearQueue() { // Delete entry removeEntry(entry); - delete entry; + SAFE_DELETE(entry); i = _cache.reverse_erase(i); } |