merge with master

1 files changed, 14 insertions, 15 deletions

diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 0fe60b2..5279fb3 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -2,8 +2,6 @@
 
 #include "types.h"
 
-#include <cstdint>
-
 namespace crepe {
 
 class ComponentManager;
@@ -11,36 +9,37 @@ class ComponentManager;
 /**
  * \brief Base class for all components
  * 
- * This class is the base class for all components. It provides a common
- * interface for all components.
+ * This class is the base class for all components. It provides a common interface for all
+ * components.
  */
 class Component {
+public:
+	//! Whether the component is active
+	bool active = true;
+	//! The id of the GameObject this component belongs to
+	const game_object_id_t game_object_id;
+
 protected:
-	//! Only the ComponentManager can create components
-	friend class crepe::ComponentManager;
 	/**
 	 * \param id The id of the GameObject this component belongs to
 	 */
 	Component(game_object_id_t id);
+	//! Only the ComponentManager can create components
+	friend class ComponentManager;
 
 public:
 	virtual ~Component() = default;
+
+public:
 	/**
 	 * \brief Get the maximum number of instances for this component
 	 *
-	 * This method returns -1 by default, which means that there is no limit
-	 * for the number of instances. Concrete components can override this method
-	 * to set a limit.
+	 * This method returns -1 by default, which means that there is no limit for the number of
+	 * instances. Concrete components can override this method to set a limit.
 	 *
 	 * \return The maximum number of instances for this component
 	 */
 	virtual int get_instances_max() const { return -1; }
-
-public:
-	//! The id of the GameObject this component belongs to
-	const game_object_id_t game_object_id;
-	//! Whether the component is active
-	bool active = true;
 };
 
 } // namespace crepe