1 files changed, 28 insertions, 2 deletions

diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index e4de027..2d12034 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -1,4 +1,5 @@
 #include "api/GameObject.h"
+#include "types.h"
 #include "util/Log.h"
 
 #include "ComponentManager.h"
@@ -10,6 +11,11 @@ ComponentManager::ComponentManager() { dbg_trace(); }
 ComponentManager::~ComponentManager() { dbg_trace(); }
 
 void ComponentManager::delete_all_components_of_id(game_object_id_t id) {
+	// Do not delete persistent objects
+	if (this->persistent[id]) {
+		return;
+	}
+
 	// Loop through all the types (in the unordered_map<>)
 	for (auto & [type, componentArray] : this->components) {
 		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
@@ -21,13 +27,33 @@ void ComponentManager::delete_all_components_of_id(game_object_id_t id) {
 }
 
 void ComponentManager::delete_all_components() {
-	this->components.clear();
+	// Loop through all the ids and delete all components of each id
+	for (game_object_id_t id = 0; id < next_id; id++) {
+		delete_all_components_of_id(id);
+	}
 	this->next_id = 0;
 }
 
 GameObject ComponentManager::new_object(const string & name, const string & tag,
-										const vec2 & position, double rotation, double scale) {
+										const vec2 & position, double rotation,
+										double scale) {
+	// Find the first available id (taking persistent objects into account)
+	while (this->persistent[this->next_id]) {
+		this->next_id++;
+		// Make sure that the persistent vector is large enough
+		if (persistent.size() <= next_id) {
+			this->persistent.resize(next_id + 1, false);
+		}
+	}
+
 	GameObject object{*this, this->next_id, name, tag, position, rotation, scale};
 	this->next_id++;
+
+	// Make sure that the persistent vector is large enough
+	if (persistent.size() <= next_id) {
+		this->persistent.resize(next_id + 1, false);
+	}
 	return object;
 }
+
+void ComponentManager::set_persistent(game_object_id_t id) { this->persistent[id] = true; }