merge conficts fixed

1 files changed, 17 insertions, 0 deletions

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 0036d1f..59e6ec0 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -1,11 +1,15 @@
 #pragma once
 
+#include <vector>
+
 namespace crepe {
 class ScriptSystem;
 }
 
 namespace crepe::api {
 
+class BehaviorScript;
+
 class Script {
 	friend class crepe::ScriptSystem;
 
@@ -16,6 +20,19 @@ protected:
 	// implemented as member methods in derivative user script classes and
 	// registered in init(), otherwise this class will balloon in size with each
 	// added event.
+
+protected:
+	template <typename T>
+	T & get_component();
+
+	template <typename T>
+	std::vector<std::reference_wrapper<T>> get_components();
+
+private:
+	friend class crepe::api::BehaviorScript;
+	BehaviorScript * parent = nullptr;
 };
 
 } // namespace crepe::api
+
+#include "Script.hpp"