AURORA: Use PtrMap for the entries in TalkTable_GFF

xoreos · Oct 26, 2016 · 8172d33 · 8172d33
1 parent 76e4d9a
commit 8172d33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/aurora/talktable_gff.cpp b/src/aurora/talktable_gff.cpp
@@ -48,12 +48,6 @@ TalkTable_GFF::TalkTable_GFF(Common::SeekableReadStream *tlk, Common::Encoding e
 }
 
 TalkTable_GFF::~TalkTable_GFF() {
-	clean();
-}
-
-void TalkTable_GFF::clean() {
-	for (Entries::iterator e = _entries.begin(); e != _entries.end(); ++e)
-		delete e->second;
 }
 
 bool TalkTable_GFF::hasEntry(uint32 strRef) const {
@@ -91,8 +85,6 @@ void TalkTable_GFF::load(Common::SeekableReadStream *tlk) {
 			throw Common::Exception("Unsupported GFF TLK file version %08X", _gff->getTypeVersion());
 
 	} catch (Common::Exception &e) {
-		clean();
-
 		e.add("Unable to load GFF TLK");
 		throw;
 	}

diff --git a/src/aurora/talktable_gff.h b/src/aurora/talktable_gff.h
@@ -29,6 +29,7 @@
 
 #include "src/common/types.h"
 #include "src/common/scopedptr.h"
+#include "src/common/ptrmap.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -67,7 +68,7 @@ class TalkTable_GFF : public TalkTable {
 		Entry(const GFF4Struct *s = 0) : strct(s) { }
 	};
 
-	typedef std::map<uint32, Entry *> Entries;
+	typedef Common::PtrMap<uint32, Entry> Entries;
 
 
 	Common::ScopedPtr<GFF4File> _gff;
@@ -84,8 +85,6 @@ class TalkTable_GFF : public TalkTable {
 
 	void readString05(Common::SeekableReadStream *huffTree,
 	                  Common::SeekableReadStream *bitStream, Entry &entry) const;
-
-	void clean();
 };
 
 } // End of namespace Aurora