diff options
| -rw-r--r-- | src/crepe/api/BehaviorScript.hpp | 10 | ||||
| -rw-r--r-- | src/crepe/api/LoopManager.hpp | 2 | ||||
| -rw-r--r-- | src/crepe/manager/Manager.h | 8 | ||||
| -rw-r--r-- | src/crepe/system/System.h | 5 |
4 files changed, 15 insertions, 10 deletions
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp index 6de0157..b9bb1e2 100644 --- a/src/crepe/api/BehaviorScript.hpp +++ b/src/crepe/api/BehaviorScript.hpp @@ -13,14 +13,12 @@ template <class T, typename... Args> BehaviorScript & BehaviorScript::set_script(Args &&... args) { dbg_trace(); static_assert(std::is_base_of<Script, T>::value); - Script * s = new T(std::forward<Args>(args)...); - Mediator & mediator = this->mediator; + this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...)); - s->game_object_id = this->game_object_id; - s->active = this->active; - s->mediator = mediator; + this->script->game_object_id = this->game_object_id; + this->script->active = this->active; + this->script->mediator = this->mediator; - this->script = std::unique_ptr<Script>(s); return *this; } diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp index cd6bd02..266758a 100644 --- a/src/crepe/api/LoopManager.hpp +++ b/src/crepe/api/LoopManager.hpp @@ -38,10 +38,10 @@ void LoopManager::load_system() { static_assert(is_base_of<System, T>::value, "load_system must recieve a derivative class of System"); - System * system = new T(this->mediator); const type_info & type = typeid(T); if (this->systems.contains(type)) throw runtime_error(format("LoopManager: {} is already initialized", type.name())); + System * system = new T(this->mediator); this->systems[type] = unique_ptr<System>(system); } diff --git a/src/crepe/manager/Manager.h b/src/crepe/manager/Manager.h index 4f21ef4..84d80fe 100644 --- a/src/crepe/manager/Manager.h +++ b/src/crepe/manager/Manager.h @@ -4,6 +4,14 @@ namespace crepe { +/** + * \brief Base manager class + * + * Managers are used for various tasks that fall outside the ECS system category. All managers + * are required to register themselves to the mediator passed to the constructor, and this + * mutable reference is saved for convenience, even though not all managers use the mediator + * directly. + */ class Manager { public: Manager(Mediator & mediator); diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h index 4e7fc6d..063dfbf 100644 --- a/src/crepe/system/System.h +++ b/src/crepe/system/System.h @@ -9,9 +9,8 @@ class ComponentManager; /** * \brief Base ECS system class * - * This class is used as the base for all system classes. Classes derived from - * System must implement the System::update() method and copy Script::Script - * with the `using`-syntax. + * This class is used as the base for all system classes. Classes derived from System must + * implement the System::update() method and copy Script::Script with the `using`-syntax. */ class System { public: |