zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-04 02:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
arthur.jamet
2021-06-17 19:24:49 +02:00
parent 7e6292134f
commit 1cf820bf87
7 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/wal/CMakeLists.txt
+5
View File
@@ -3,6 +3,11 @@ project(wal)
set(CMAKE_CXX_STANDARD 20)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -Wshadow -W -Werror -Wno-unused-param -g")
endif()
set(CMAKE_CXX_FLAGS_RELEASE "-O2")
add_library(wal
sources/Entity/Entity.hpp
sources/Component/Component.hpp
lib/wal/sources/Entity/Entity.cpp
+4 -4
View File
@@ -13,17 +13,17 @@ namespace WAL
Entity::Entity(Scene &scene, std::string name, bool notifyScene)
: _uid(Entity::nextID++),
_scene(scene),
_name(std::move(name)),
_notifyScene(notifyScene)
_notifyScene(notifyScene),
_scene(scene)
{ }
Entity::Entity(const Entity &other)
: _uid(Entity::nextID++),
_scene(other._scene),
_name(other._name),
_disabled(other._disabled),
_notifyScene(other._notifyScene)
_notifyScene(other._notifyScene),
_scene(other._scene)
{
for (const auto &cmp : other._components)
this->addComponent(*cmp.second);
lib/wal/sources/Scene/Scene.cpp
+2 -2
View File
@@ -34,8 +34,8 @@ namespace WAL
for (auto &view : this->_views) {
if (std::find(view->getTypes().begin(), view->getTypes().end(), type) == view->getTypes().end())
continue;
bool valid = std::all_of(view->getTypes().begin(), view->getTypes().end(), [&entity](const auto &type){
return entity.hasComponent(type);
bool valid = std::all_of(view->getTypes().begin(), view->getTypes().end(), [&entity](const auto &ltype){
return entity.hasComponent(ltype);
});
if (valid)
view->emplace_back(entity);