diff options
| author | Matthew Hoops | 2010-11-09 18:52:29 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-11-09 18:52:29 +0000 |
| commit | 0dd4a4610269e2ff66327dee0cc70ff8e4a26084 (patch) | |
| tree | 988c93eb20f3663335696284cfe3a59b4cc7992c /engines | |
| parent | a4978587d8bbb6ba401b48ca0e3f24e443c5a0d2 (diff) | |
| download | scummvm-rg350-0dd4a4610269e2ff66327dee0cc70ff8e4a26084.tar.gz scummvm-rg350-0dd4a4610269e2ff66327dee0cc70ff8e4a26084.tar.bz2 scummvm-rg350-0dd4a4610269e2ff66327dee0cc70ff8e4a26084.zip | |
MOHAWK: Fix cache memory leak and some formatting
svn-id: r54165
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/resource_cache.cpp | 21 | ||||
| -rw-r--r-- | engines/mohawk/resource_cache.h | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/engines/mohawk/resource_cache.cpp b/engines/mohawk/resource_cache.cpp index 8525bbc127..75f608f5fd 100644 --- a/engines/mohawk/resource_cache.cpp +++ b/engines/mohawk/resource_cache.cpp @@ -43,16 +43,17 @@ void ResourceCache::clear() { debugC(kDebugCache, "Clearing Cache..."); - // TODO: Not sure if need to explicitly delete DataObject.data element ie. - // returned by readStream method here. - store.clear(); + for (uint32 i = 0; i < _store.size(); i++) + delete _store[i].data; + + _store.clear(); } void ResourceCache::add(uint32 tag, uint16 id, Common::SeekableReadStream *data) { if (!enabled) return; - debugC(kDebugCache, "Adding item %d - tag 0x%04X id %d", store.size(), tag, id); + debugC(kDebugCache, "Adding item %d - tag 0x%04X id %d", _store.size(), tag, id); DataObject current; current.tag = tag; @@ -60,7 +61,7 @@ void ResourceCache::add(uint32 tag, uint16 id, Common::SeekableReadStream *data) uint32 dataCurPos = data->pos(); current.data = data->readStream(data->size()); data->seek(dataCurPos); - store.push_back(current); + _store.push_back(current); } // Returns NULL if not found @@ -70,12 +71,12 @@ Common::SeekableReadStream *ResourceCache::search(uint32 tag, uint16 id) { debugC(kDebugCache, "Searching for tag 0x%04X id %d", tag, id); - for (uint32 i = 0; i < store.size(); i++) { - if (tag == store[i].tag && id == store[i].id) { + for (uint32 i = 0; i < _store.size(); i++) { + if (tag == _store[i].tag && id == _store[i].id) { debugC(kDebugCache, "Found cached tag 0x%04X id %u", tag, id); - uint32 dataCurPos = store[i].data->pos(); - Common::SeekableReadStream *ret = store[i].data->readStream(store[i].data->size()); - store[i].data->seek(dataCurPos); + uint32 dataCurPos = _store[i].data->pos(); + Common::SeekableReadStream *ret = _store[i].data->readStream(_store[i].data->size()); + _store[i].data->seek(dataCurPos); return ret; } } diff --git a/engines/mohawk/resource_cache.h b/engines/mohawk/resource_cache.h index 506d223ff1..32e345cf4b 100644 --- a/engines/mohawk/resource_cache.h +++ b/engines/mohawk/resource_cache.h @@ -51,7 +51,7 @@ private: Common::SeekableReadStream *data; }; - Common::Array<DataObject> store; + Common::Array<DataObject> _store; }; } // End of namespace Mohawk |