From da856c5f18ea614ad4c23c9a9010311f581ae52e Mon Sep 17 00:00:00 2001 From: Gregory LeMasurier Date: Thu, 18 Apr 2024 15:46:00 -0400 Subject: [PATCH] Interaction now derived from action base --- include/behaviortree_cpp/interaction_node.h | 5 +---- src/interaction_node.cpp | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/behaviortree_cpp/interaction_node.h b/include/behaviortree_cpp/interaction_node.h index b00d2edcf..f54db5340 100644 --- a/include/behaviortree_cpp/interaction_node.h +++ b/include/behaviortree_cpp/interaction_node.h @@ -6,15 +6,12 @@ namespace BT { -class InteractionNode : public SyncActionNode +class InteractionNode : public ActionNodeBase { public: InteractionNode(const std::string& name, const NodeConfig& config); ~InteractionNode() override = default; - /// throws if the derived class return RUNNING. - virtual NodeStatus executeTick() override; - virtual NodeType type() const override final { return NodeType::INTERACTION; diff --git a/src/interaction_node.cpp b/src/interaction_node.cpp index b45de333b..1bb4de0a4 100644 --- a/src/interaction_node.cpp +++ b/src/interaction_node.cpp @@ -3,6 +3,7 @@ namespace BT { InteractionNode::InteractionNode(const std::string& name, const NodeConfig& config) - : SyncActionNode(name, config) + : ActionNodeBase(name, config) {} + } \ No newline at end of file