From 9619f340827b00d4836406ded073a73b6df9386f Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 21 Nov 2024 09:10:40 +0100 Subject: do not call event handlers when behaviorscript is not active + add doxygen --- src/crepe/api/Script.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/crepe/api/Script.hpp') diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp index 96e4a36..8186bd4 100644 --- a/src/crepe/api/Script.hpp +++ b/src/crepe/api/Script.hpp @@ -22,7 +22,7 @@ template std::vector> Script::get_components() const { ComponentManager & mgr = *this->component_manager_ref; - return mgr.get_components_by_id(this->game_object_id); + return mgr.get_components_by_id(*this->game_object_id_ref); } template @@ -33,7 +33,11 @@ void Script::logf(Args &&... args) { template void Script::subscribe_internal(const EventHandler & callback, event_channel_t channel) { EventManager & mgr = *this->event_manager_ref; - subscription_t listener = mgr.subscribe(callback, channel); + subscription_t listener = mgr.subscribe([this, callback](const EventType & data) -> bool { + bool & active = *this->active_ref; + if (!active) return false; + return callback(data); + }, channel); this->listeners.push_back(listener); } -- cgit v1.2.3