merge `origin/master` into `master`

1 files changed, 24 insertions, 6 deletions

diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index e9542c1..6133cc8 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,17 +1,35 @@
 #pragma once
 
-#include "../Script.h"
+#include <memory>
+
 #include "../Component.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;
+	using Component::Component;
+
+public:
+	virtual ~BehaviorScript() = default;
+
+public:
+	template <class T>
+	BehaviorScript & set_script();
 
 protected:
-	BehaviorScript();
+	friend class crepe::ScriptSystem;
+	std::unique_ptr<Script> script = nullptr;
 };
 
-}
+} // namespace crepe::api
 
+#include "BehaviorScript.hpp"