diff --git a/CMakeLists.txt b/CMakeLists.txt index dfb9d892..352a531b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ add_executable(unit_tests EXCLUDE_FROM_ALL tests/EngineTests.cpp tests/CallbackTest.cpp tests/MoveTests.cpp -tests/ViewTest.cpp + tests/ViewTest.cpp tests/CollisionTest.cpp ) target_include_directories(unit_tests PUBLIC sources) diff --git a/lib/wal/sources/Entity/Entity.hpp b/lib/wal/sources/Entity/Entity.hpp index 43aecb33..9fbd3657 100644 --- a/lib/wal/sources/Entity/Entity.hpp +++ b/lib/wal/sources/Entity/Entity.hpp @@ -27,7 +27,7 @@ namespace WAL //! @brief Is this entity enabled? bool _disabled = false; //! @brief Has this entity been scheduled for deletion? - bool _shouldDelete; + bool _shouldDelete = false; //! @brief The list of the components of this entity std::unordered_map> _components = {}; @@ -174,7 +174,5 @@ namespace WAL ~Entity() = default; //! @brief An entity is not assignable Entity &operator=(const Entity &) = delete; - //! @brief An entity is move assignable. - Entity &operator=(Entity &&) = default; }; } // namespace WAL \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index b9c39aa9..e3d2a4f5 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -52,7 +52,6 @@ namespace WAL } for (auto &system : this->_systems) system->update(dtime); - auto &entities = this->scene->getEntities(); this->scene->deleteMarkedEntities(); callback(*this, state); } diff --git a/sources/Component/BombHolder/BombHolderComponent.cpp b/sources/Component/BombHolder/BombHolderComponent.cpp index bff44867..9f75b8ae 100644 --- a/sources/Component/BombHolder/BombHolderComponent.cpp +++ b/sources/Component/BombHolder/BombHolderComponent.cpp @@ -19,6 +19,6 @@ namespace BBM WAL::Component *BombHolderComponent::clone(WAL::Entity &entity) const { - return new BombHolderComponent(entity); + return new BombHolderComponent(entity, this->maxBombCount); } } \ No newline at end of file