diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 | 
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 | 
| commit | 15a4c4a1cf67e13be53ef423c51c56488f332ea9 (patch) | |
| tree | 661084fc8171089ce32bf779f2b3a85d634b38e4 /src/crepe/api/BehaviorScript.hpp | |
| parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
| parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) | |
merge conficts fixed
Diffstat (limited to 'src/crepe/api/BehaviorScript.hpp')
| -rw-r--r-- | src/crepe/api/BehaviorScript.hpp | 3 | 
1 files changed, 3 insertions, 0 deletions
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp index a6bd81c..2a3502f 100644 --- a/src/crepe/api/BehaviorScript.hpp +++ b/src/crepe/api/BehaviorScript.hpp @@ -3,7 +3,9 @@  #include <type_traits>  #include "../util/log.h" +  #include "BehaviorScript.h" +#include "Script.h"  namespace crepe::api { @@ -12,6 +14,7 @@ BehaviorScript & BehaviorScript::set_script() {  	static_assert(std::is_base_of<Script, T>::value);  	dbg_trace();  	Script * s = new T(); +	s->parent = this;  	this->script = std::unique_ptr<Script>(s);  	return *this;  }  |