NWN2: Use PtrMap for the areas in Module

xoreos · Oct 26, 2016 · 977bb21 · 977bb21
1 parent 67752b0
commit 977bb21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/engines/nwn2/module.cpp b/src/engines/nwn2/module.cpp
@@ -409,9 +409,6 @@ void Module::loadAreas() {
 }
 
 void Module::unloadAreas() {
-	for (AreaMap::iterator a = _areas.begin(); a != _areas.end(); ++a)
-		delete a->second;
-
 	_areas.clear();
 	_newArea.clear();
 

diff --git a/src/engines/nwn2/module.h b/src/engines/nwn2/module.h
@@ -30,6 +30,7 @@
 #include <map>
 #include <set>
 
+#include "src/common/ptrmap.h"
 #include "src/common/ustring.h"
 #include "src/common/changeid.h"
 
@@ -141,7 +142,7 @@ class Module : public NWN2::Object, public NWN2::ObjectContainer {
 		bool operator<(const Action &s) const;
 	};
 
-	typedef std::map<Common::UString, Area *> AreaMap;
+	typedef Common::PtrMap<Common::UString, Area> AreaMap;
 
 	typedef std::list<Events::Event> EventQueue;
 	typedef std::multiset<Action> ActionQueue;