NWN2: Use PtrList for the TRX parts

xoreos · Oct 26, 2016 · 85bed3e · 85bed3e
1 parent d391dae
commit 85bed3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/engines/nwn2/trxfile.cpp b/src/engines/nwn2/trxfile.cpp
@@ -59,11 +59,6 @@ TRXFile::TRXFile(const Common::UString &resRef) : _visible(false) {
 
 TRXFile::~TRXFile() {
 	hide();
-
-	for (ObjectList::iterator t = _terrain.begin(); t != _terrain.end(); ++t)
-		delete *t;
-	for (ObjectList::iterator w = _water.begin(); w != _water.end(); ++w)
-		delete *w;
 }
 
 void TRXFile::show() {

diff --git a/src/engines/nwn2/trxfile.h b/src/engines/nwn2/trxfile.h
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "src/common/types.h"
+#include "src/common/ptrlist.h"
 
 namespace Common {
 	class UString;
@@ -78,7 +79,7 @@ class TRXFile {
 		uint32 size;   ///< Size of the packet.
 	};
 
-	typedef std::list<Graphics::Aurora::GeometryObject *> ObjectList;
+	typedef Common::PtrList<Graphics::Aurora::GeometryObject> ObjectList;
 
 
 	bool _visible;