Maybe fixed crashes and memory leak

Signed-off-by: Dan Printzell <[email protected]>

Author: Vild

NoLib.valgrind

@@ -0,0 +1,12 @@
+{
+   ignore_unversioned_libs
+   Memcheck:Leak
+   ...
+   obj:*/lib*/lib*.so
+}
+{
+   ignore_versioned_libs
+   Memcheck:Leak
+   ...
+   obj:*/lib*/lib*.so.*
+}

src/world/component/component.cpp

@@ -1,3 +1,3 @@
 // This is a personal academic project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-#include "component.hpp"
+#include "component.hpp"

src/world/entity.cpp

@@ -7,14 +7,10 @@
 Entity::Entity(World& world, std::string name) : _world(world), _name(name) {}
 
 Entity::~Entity() {
-	for (auto& pair : components) {
-		try {
-			components.erase(pair.first);
-			auto& ents = _world._activeComponents[pair.first];
-			auto it = std::find(ents.begin(), ents.end(), this);
-			ents.erase(it);
-		} catch (std::exception&) {
-			fprintf(stderr, "MEMORY LEAK!!! Component failed being freed!");
-		}
+	auto it = _components.begin();
+	while (it != _components.end()) {
+		auto& ents = _world._activeComponents[(*it).first];
+		ents.erase(std::find(ents.begin(), ents.end(), this));
+		it++;
 	}
-}
+}

src/world/entity.hpp

@@ -23,7 +23,7 @@ class Entity {
 
 	template <typename T, typename... Args, typename std::enable_if<std::is_base_of<Component, T>::value>::type* = nullptr>
 	T* addComponent(Args... args) {
-		auto ret = components.insert_or_assign(typeid(T), std::make_unique<T>(args...));
+		auto ret = _components.insert_or_assign(typeid(T), std::make_unique<T>(args...));
 
 		_world._activeComponents[typeid(T)].push_back(this);
 
@@ -33,17 +33,17 @@ class Entity {
 	template <typename T, typename std::enable_if<std::is_base_of<Component, T>::value>::type* = nullptr>
 	T* getComponent() {
 		T* component = nullptr;
-		auto it = components.find(typeid(T));
+		auto it = _components.find(typeid(T));
 
-		if (it != components.end())
+		if (it != _components.end())
 			component = static_cast<T*>(it->second.get());
 
 		return component;
 	}
 
 	template <typename T, typename std::enable_if<std::is_base_of<Component, T>::value>::type* = nullptr>
 	void removeComponent() {
-		components.erase(typeid(T));
+		_components.erase(typeid(T));
 		auto& ents = _world._activeComponents[typeid(T)];
 		ents.erase(std::find(ents.begin(), ents.end(), this));
 	}
@@ -54,13 +54,13 @@ class Entity {
 	inline std::string& getName() { return _name; }
 	inline void makeDead() { _dead = true; }
 	inline bool isDead() { return _dead; }
-	inline std::map<std::type_index, std::unique_ptr<Component>>& getComponents() { return components; }
+	inline std::map<std::type_index, std::unique_ptr<Component>>& getComponents() { return _components; }
 	inline bool& getHide() { return _hide; }
 
 private:
 	World& _world;
 	std::string _name;
-	std::map<std::type_index, std::unique_ptr<Component>> components;
+	std::map<std::type_index, std::unique_ptr<Component>> _components;
 
 	bool _dead = false;
 	bool _hide = false;

src/world/world.cpp

@@ -4,7 +4,4 @@
 
 World::World() {}
 
-World::~World() {
-	_entities.clear();
-	_activeComponents.clear();
-}
+World::~World() {}

src/world/world.hpp

@@ -6,6 +6,7 @@
 #include <typeindex>
 
 class Entity;
+class Component;
 
 class World {
 public:
@@ -26,8 +27,9 @@ class World {
 
 private:
 	friend class Entity;
-	std::vector<std::unique_ptr<Entity>> _entities;
+	friend class Component;
 	std::map<std::type_index, std::vector<Entity*>> _activeComponents;
+	std::vector<std::unique_ptr<Entity>> _entities;
 };
 
 #include "entity.hpp"