DRAGONAGE2: Use PtrVector for the room models

xoreos · Oct 26, 2016 · c929073 · c929073
1 parent acf7c17
commit c929073
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/engines/dragonage2/room.cpp b/src/engines/dragonage2/room.cpp
@@ -64,6 +64,7 @@ Room::Room(const Aurora::GFF4Struct &room) {
 }
 
 Room::~Room() {
+	hide();
 	clean();
 }
 
@@ -73,11 +74,6 @@ int32 Room::getID() const {
 
 void Room::clean() {
 	try {
-		hide();
-
-		for (Models::iterator m = _models.begin(); m != _models.end(); ++m)
-			delete *m;
-
 		deindexResources(_resources);
 	} catch (...) {
 	}

diff --git a/src/engines/dragonage2/room.h b/src/engines/dragonage2/room.h
@@ -27,6 +27,7 @@
 
 #include <vector>
 
+#include "src/common/ptrvector.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -50,7 +51,7 @@ class Room {
 	void hide();
 
 private:
-	typedef std::vector<Graphics::Aurora::Model *> Models;
+	typedef Common::PtrVector<Graphics::Aurora::Model> Models;
 
 	int32 _id;