zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-06 19:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser

Browse Source 
# Conflicts:
#	sources/Component/BombHolder/BombHolderComponent.cpp
#	sources/Map/Map.cpp
This commit is contained in:
Clément Le Bihan
2021-06-18 11:17:27 +02:00
parent 5826b5f66f f1918678be
commit 01982d00fe
53 changed files with 168 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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);