merge with master and keypressed added to game

1 files changed, 11 insertions, 6 deletions

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index a0870cb..1474a09 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,11 +2,12 @@
 
 #include <vector>
 
+#include "../manager/EventManager.h"
+#include "system/CollisionSystem.h"
+#include "../manager/Mediator.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
 
-#include "EventManager.h"
-
 namespace crepe {
 
 class ScriptSystem;
@@ -106,6 +107,12 @@ protected:
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback);
 
+	/**
+	 * \brief Set the next scene using SceneManager
+	 * \see SceneManager::set_next_scene
+	 */
+	void set_next_scene(const std::string & name);
+
 	//! \}
 
 private:
@@ -160,10 +167,8 @@ private:
 	game_object_id_t game_object_id;
 	//! Reference to parent component
 	OptionalRef<bool> active;
-	//! Reference to component manager instance
-	OptionalRef<ComponentManager> component_manager;
-	//! Reference to event manager instance
-	OptionalRef<EventManager> event_manager;
+	//! Mediator reference
+	OptionalRef<Mediator> mediator;
 	//! \}
 
 private: