DRAGONAGE2: Use PtrList for the creature models

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

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/src/engines/dragonage2/creature.cpp b/src/engines/dragonage2/creature.cpp
@@ -70,16 +70,11 @@ Creature::Creature() : Object(kObjectTypeCreature) {
 Creature::Creature(const GFF3Struct &creature) : Object(kObjectTypeCreature) {
 	init();
 
-	try {
-		load(creature);
-	} catch (...) {
-		clean();
-		throw;
-	}
+	load(creature);
 }
 
 Creature::~Creature() {
-	clean();
+	hide();
 }
 
 void Creature::init() {
@@ -91,16 +86,6 @@ void Creature::init() {
 		_partVariation[i] = 0xFFFFFFFF;
 }
 
-void Creature::clean() {
-	try {
-		hide();
-
-		for (Models::iterator m = _models.begin(); m != _models.end(); ++m)
-			delete *m;
-	} catch (...) {
-	}
-}
-
 void Creature::setPosition(float x, float y, float z) {
 	Object::setPosition(x, y, z);
 	Object::getPosition(x, y, z);

diff --git a/src/engines/dragonage2/creature.h b/src/engines/dragonage2/creature.h
@@ -28,6 +28,7 @@
 #include <vector>
 #include <list>
 
+#include "src/common/ptrlist.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -101,7 +102,7 @@ class Creature : public Object {
 	};
 	typedef std::vector<EquipItem> Items;
 
-	typedef std::list<Graphics::Aurora::Model *> Models;
+	typedef Common::PtrList<Graphics::Aurora::Model> Models;
 
 
 	bool _isPC; ///< Is the creature a PC?
@@ -144,8 +145,6 @@ class Creature : public Object {
 	static Common::UString createModelPrefix(const Aurora::GDAFile &gda, size_t row);
 	static Common::UString createModelPart(const Aurora::GDAFile &gda, size_t row,
 	                                       const Common::UString &prefix);
-
-	void clean();
 };
 
 } // End of namespace Dragon Age