Merge branch 'master' into niels/rendering_color

1 files changed, 10 insertions, 2 deletions

diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 34ef8bb..4cd2bc0 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "Vector2.h"
 #include "types.h"
 
 namespace crepe {
@@ -30,7 +29,7 @@ private:
 	 * \param scale The scale of the GameObject
 	 */
 	GameObject(ComponentManager & component_manager, game_object_id_t id,
-			   const std::string & name, const std::string & tag, const Vector2 & position,
+			   const std::string & name, const std::string & tag, const vec2 & position,
 			   double rotation, double scale);
 	//! ComponentManager instances GameObject
 	friend class ComponentManager;
@@ -59,6 +58,15 @@ public:
 	 */
 	template <typename T, typename... Args>
 	T & add_component(Args &&... args);
+	/**
+	 * \brief Components will not be deleted if this method is called
+	 *
+	 * This method sets the persistent flag of the GameObject to true. If the persistent
+	 * flag is set to true, the GameObject will not be deleted when the scene is changed.
+	 *
+	 * \param persistent The persistent flag
+	 */
+	void set_persistent(bool persistent = true);
 
 public:
 	//! The id of the GameObject