diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-11-18 14:27:58 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-11-18 14:27:58 +0100 |
| commit | 03e493012edc106b00bc5676c1830ce2085a7ff9 (patch) | |
| tree | ff06d4314552e82f98d08c52d7a15edb3a74436e /src/crepe/api/BehaviorScript.hpp | |
| parent | 21f5b66d0bcc13d903800adf3bb614e380ff8591 (diff) | |
| parent | 121b64b1cb6cfead5814070c8b0185d3d7308095 (diff) | |
Merge remote-tracking branch 'origin/master' into niels/sorting_rendering
Diffstat (limited to 'src/crepe/api/BehaviorScript.hpp')
| -rw-r--r-- | src/crepe/api/BehaviorScript.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp index 4751607..d80321d 100644 --- a/src/crepe/api/BehaviorScript.hpp +++ b/src/crepe/api/BehaviorScript.hpp @@ -2,7 +2,7 @@ #include <type_traits> -#include "../util/log.h" +#include "../util/Log.h" #include "BehaviorScript.h" #include "Script.h" @@ -11,10 +11,11 @@ namespace crepe { template <class T> BehaviorScript & BehaviorScript::set_script() { - static_assert(std::is_base_of<Script, T>::value); dbg_trace(); + static_assert(std::is_base_of<Script, T>::value); Script * s = new T(); - s->parent = this; + s->game_object_id = this->game_object_id; + s->component_manager_ref = &this->component_manager; this->script = std::unique_ptr<Script>(s); return *this; } |