NWN2: getTrapBaseType scripting function

xoreos · Feb 23, 2019 · 2af62c6 · 2af62c6
1 parent 7da634d
commit 2af62c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/engines/nwn2/script/function_tables.h b/src/engines/nwn2/script/function_tables.h
@@ -669,7 +669,7 @@ const Functions::FunctionPointer Functions::kFunctionPointers[] = {
 	{  528, "GetTrapDetectable"                   , 0                                                },
 	{  529, "GetTrapDetectedBy"                   , 0                                                },
 	{  530, "GetTrapFlagged"                      , 0                                                },
-	{  531, "GetTrapBaseType"                     , 0                                                },
+	{  531, "GetTrapBaseType"                     , &Functions::getTrapBaseType                      },
 	{  532, "GetTrapOneShot"                      , 0                                                },
 	{  533, "GetTrapCreator"                      , 0                                                },
 	{  534, "GetTrapKeyTag"                       , 0                                                },

diff --git a/src/engines/nwn2/script/functions.h b/src/engines/nwn2/script/functions.h
@@ -231,8 +231,9 @@ class Functions {
 	void getCurrentHitPoints(Aurora::NWScript::FunctionContext &ctx);
 	void getMaxHitPoints    (Aurora::NWScript::FunctionContext &ctx);
 
-	void getIsTrapped (Aurora::NWScript::FunctionContext &ctx);
-	void getTrapActive(Aurora::NWScript::FunctionContext &ctx);
+	void getIsTrapped   (Aurora::NWScript::FunctionContext &ctx);
+	void getTrapActive  (Aurora::NWScript::FunctionContext &ctx);
+	void getTrapBaseType(Aurora::NWScript::FunctionContext &ctx);
 
 	void setTrapActive(Aurora::NWScript::FunctionContext &ctx);
 

diff --git a/src/engines/nwn2/script/functions_object.cpp b/src/engines/nwn2/script/functions_object.cpp
@@ -403,6 +403,15 @@ void Functions::getTrapActive(Aurora::NWScript::FunctionContext &ctx) {
 	ctx.getReturn() = (trigger) ? trigger->getTrapActive() : 0;
 }
 
+void Functions::getTrapBaseType(Aurora::NWScript::FunctionContext &ctx) {
+	NWN2::Object *object = NWN2::ObjectContainer::toObject(getParamObject(ctx, 0));
+	if (!object)
+		return;
+
+	Trigger *trigger = NWN2::ObjectContainer::toTrigger(object);
+	ctx.getReturn() = trigger->getTrapBaseType();
+}
+
 void Functions::setTrapActive(Aurora::NWScript::FunctionContext &ctx) {
 	NWN2::Object *object = NWN2::ObjectContainer::toObject(getParamObject(ctx, 0));
 	if (!object)