fix more

include/entities.hpp

@@ -83,7 +83,7 @@ struct Triangle: public Entity {
 	void unloadSyncPacket(sf::Packet& packet) override;
 
 	uint8_t type() override;
-	double accel = 6, rotateSpeed = 2.0, boostCooldown = 15.0, boostStrength = 2.0, reload = 6.0, shootPower = 2.0,
+	double accel = 0.006, rotateSpeed = 2.0, boostCooldown = 15.0, boostStrength = 2.0, reload = 6.0, shootPower = 2.0,
 	lastBoosted = -boostCooldown, lastShot = -reload;
 
 	std::string name = "";

include/globals.hpp

@@ -20,6 +20,7 @@ inline sf::Font* font = nullptr;
 inline obf::Player* sparePlayer = new obf::Player;
 inline std::vector<Entity*> updateGroup;
 inline std::vector<Player*> playerGroup;
+inline std::vector<Entity*> entityDeleteBuffer;
 inline std::vector<Attractor*> planets;
 inline sf::Vector2i mousePos;
 inline sf::Clock deltaClock, globalClock;

src/entities.cpp

@@ -44,7 +44,7 @@ Player::~Player() {
 	for (Player* p : playerGroup) {
 		p->tcpSocket.send(chatPacket);
 	}
-	delete this->entity;
+	entityDeleteBuffer.push_back(entity);
 }
 
 Entity::Entity() {
@@ -139,7 +139,7 @@ void Entity::update() {
 					}
 				}
 				if (!found) {
-					delete e;
+					entityDeleteBuffer.push_back(e);
 				}
 			}
 		}
@@ -414,12 +414,12 @@ void Projectile::collide(Entity* with, bool collideOther) {
 				}
 			}
 		}
-		delete this;
+		entityDeleteBuffer.push_back(this);
 	} else if (with->type() == Entities::Attractor) {
 		if (debug) {
 			printf("of type attractor\n");
 		}
-		delete this;
+		entityDeleteBuffer.push_back(this);
 	} else {
 		if (debug) {
 			printf("of unaccounted type\n");

src/main.cpp

@@ -427,6 +427,10 @@ int main(int argc, char** argv) {
 		for (size_t i = 0; i < updateGroup.size(); i++) {
 			updateGroup[i]->update();
 		}
+		for (Entity* e : entityDeleteBuffer) {
+			delete e;
+		}
+		entityDeleteBuffer.clear();
 		if (headless) {
 			int to = playerGroup.size();
 			for (int i = 0; i < to; i++) {