merge `origin/master` into `master`

1 files changed, 11 insertions, 3 deletions

diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 16a4ce5..bc44865 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -1,13 +1,21 @@
 #pragma once
 
+#include <cstdint>
+
 namespace crepe {
 
+class ComponentManager;
+
 class Component {
+protected:
+	friend class crepe::ComponentManager;
+	Component(uint32_t id);
+
 public:
-	Component();
-	// TODO: shouldn't this constructor be deleted because this class will never
-	// directly be instantiated?
+	virtual ~Component() = default;
 
+public:
+	uint32_t game_object_id;
 	bool active;
 };