DRAGONAGE: Use loadOptionalGFF3() when looking for object blueprints

xoreos · Oct 26, 2016 · 343f3f8 · 343f3f8
1 parent b79bf7f
commit 343f3f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/engines/dragonage/creature.cpp b/src/engines/dragonage/creature.cpp
@@ -35,6 +35,7 @@
 
 #include "src/graphics/aurora/model.h"
 
+#include "src/engines/aurora/util.h"
 #include "src/engines/aurora/model.h"
 
 #include "src/engines/dragonage/creature.h"
@@ -167,12 +168,8 @@ void Creature::load(const GFF3Struct &creature) {
 	_resRef = creature.getString("TemplateResRef");
 
 	Common::ScopedPtr<GFF3File> utc;
-	if (!_resRef.empty()) {
-		try {
-			utc.reset(new GFF3File(_resRef, Aurora::kFileTypeUTC, kUTCID));
-		} catch (...) {
-		}
-	}
+	if (!_resRef.empty())
+		utc.reset(loadOptionalGFF3(_resRef, Aurora::kFileTypeUTC, kUTCID));
 
 	load(creature, utc ? &utc->getTopLevel() : 0);
 }

diff --git a/src/engines/dragonage/placeable.cpp b/src/engines/dragonage/placeable.cpp
@@ -30,6 +30,7 @@
 
 #include "src/graphics/aurora/model.h"
 
+#include "src/engines/aurora/util.h"
 #include "src/engines/aurora/model.h"
 
 #include "src/engines/dragonage/placeable.h"
@@ -102,12 +103,8 @@ void Placeable::load(const Aurora::GFF3Struct &placeable) {
 	_resRef = placeable.getString("TemplateResRef");
 
 	Common::ScopedPtr<Aurora::GFF3File> utp;
-	if (!_resRef.empty()) {
-		try {
-			utp.reset(new Aurora::GFF3File(_resRef, Aurora::kFileTypeUTP, MKTAG('U', 'T', 'P', ' ')));
-		} catch (...) {
-		}
-	}
+	if (!_resRef.empty())
+		utp.reset(loadOptionalGFF3(_resRef, Aurora::kFileTypeUTP, MKTAG('U', 'T', 'P', ' ')));
 
 	load(placeable, utp ? &utp->getTopLevel() : 0);
 }