Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events

1 files changed, 10 insertions, 6 deletions

diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index ce39331..a064a90 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -8,17 +8,21 @@
 namespace crepe {
 
 template <typename T>
-T & Script::get_component() {
-	std::vector<std::reference_wrapper<T>> all_components = this->get_components<T>();
-	if (all_components.size() < 1) throw nullptr; // TODO
+T & Script::get_component() const {
+	using namespace std;
+	vector<reference_wrapper<T>> all_components = this->get_components<T>();
+	if (all_components.size() < 1)
+		throw runtime_error(
+			format("Script: no component found with type = {}", typeid(T).name()));
 
 	return all_components.back().get();
 }
 
 template <typename T>
-std::vector<std::reference_wrapper<T>> Script::get_components() {
-	ComponentManager & mgr = ComponentManager::get_instance();
-	return mgr.get_components_by_id<T>(this->parent->game_object_id);
+std::vector<std::reference_wrapper<T>> Script::get_components() const {
+	auto & mgr = *this->component_manager_ref;
+
+	return mgr.get_components_by_id<T>(this->game_object_id);
 }
 
 } // namespace crepe