Working color, fucked up git merge

1 files changed, 4 insertions, 10 deletions

diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index e7f298c..35f960d 100644
--- a/src/crepe/api/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
@@ -1,18 +1,12 @@
 #include "ParticleEmitter.h"
-#include "Particle.h"
 
 using namespace crepe;
 
-ParticleEmitter::ParticleEmitter(uint32_t game_object_id, const Data & data)
-	: Component(game_object_id), data(data) {
+ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id,
+								 const Data & data)
+	: Component(game_object_id),
+	  data(data) {
 	for (size_t i = 0; i < this->data.max_particles; i++) {
 		this->data.particles.emplace_back();
 	}
 }
-
-ParticleEmitter::~ParticleEmitter() {
-	std::vector<Particle>::iterator it = this->data.particles.begin();
-	while (it != this->data.particles.end()) {
-		it = this->data.particles.erase(it);
-	}
-}