Merge branch 'master' into niels/rendering

1 files changed, 25 insertions, 5 deletions

diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 1d05a75..6ce6798 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,16 +1,36 @@
 #pragma once
 
-#include "../Component.h"
-#include "../Script.h"
+#include <memory>
+
+#include "Component.h"
+#include "Script.h"
+
+namespace crepe {
+class ScriptSystem;
+class ComponentManager;
+} // namespace crepe
 
 namespace crepe::api {
 
-class BehaviorScript : public Script, public Component {
-	// only allow ComponentManager to instantiate scripts
-	friend class ComponentManager;
+class Script;
 
+class BehaviorScript : public Component {
 protected:
+	friend class crepe::ComponentManager;
 	BehaviorScript();
+
+public:
+	virtual ~BehaviorScript() = default;
+
+public:
+	template <class T>
+	BehaviorScript & set_script();
+
+protected:
+	friend class crepe::ScriptSystem;
+	std::unique_ptr<Script> script = nullptr;
 };
 
 } // namespace crepe::api
+
+#include "BehaviorScript.hpp"