NWN2: Use PtrList for the area objects

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

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/engines/nwn2/area.cpp b/src/engines/nwn2/area.cpp
@@ -89,10 +89,8 @@ Area::~Area() {
 
 void Area::clear() {
 	// Delete objects
-	for (ObjectList::iterator o = _objects.begin(); o != _objects.end(); ++o) {
+	for (ObjectList::iterator o = _objects.begin(); o != _objects.end(); ++o)
 		_module->removeObject(**o);
-		delete *o;
-	}
 
 	_objects.clear();
 

diff --git a/src/engines/nwn2/area.h b/src/engines/nwn2/area.h
@@ -31,6 +31,7 @@
 
 #include "src/common/types.h"
 #include "src/common/scopedptr.h"
+#include "src/common/ptrlist.h"
 #include "src/common/ustring.h"
 #include "src/common/mutex.h"
 
@@ -147,7 +148,7 @@ class Area : public NWN2::Object, public Events::Notifyable {
 		Graphics::Aurora::Model *model;
 	};
 
-	typedef std::list<Engines::NWN2::Object *> ObjectList;
+	typedef Common::PtrList<Engines::NWN2::Object> ObjectList;
 	typedef std::map<uint32, Engines::NWN2::Object *> ObjectMap;