NWN2: Add Trap class to the Trigger class

xoreos · Nov 23, 2018 · 528e87a · 528e87a
1 parent 818fa07
commit 528e87a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/engines/nwn2/trigger.cpp b/src/engines/nwn2/trigger.cpp
@@ -66,6 +66,12 @@ void Trigger::load(const Aurora::GFF3Struct &gff) {
 	if (!utt)
 		warning("Trigger \"%s\" has no blueprint", temp.c_str());
 
+	try {
+		_trap.reset(new Trap(gff));
+	} catch (...) {
+		Common::exceptionDispatcherWarning();
+	}
+
 	float x, y, z;
 	x = (float)gff.getDouble("XPosition");
 	y = (float)gff.getDouble("YPosition");

diff --git a/src/engines/nwn2/trigger.h b/src/engines/nwn2/trigger.h
@@ -28,6 +28,7 @@
 #include "src/engines/aurora/trigger.h"
 
 #include "src/engines/nwn2/object.h"
+#include "src/engines/nwn2/trap.h"
 
 namespace Engines {
 
@@ -46,6 +47,9 @@ class Trigger : public ::Engines::Trigger, public Object {
 protected:
 	void load(const Aurora::GFF3Struct &gff);
 	void loadBlueprint(const Aurora::GFF3Struct &gff);
+
+private:
+	Common::ScopedPtr<Trap> _trap; ///< The trigger's trap.
 };
 
 } // End of namespace NWN2