zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 13:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into height_map_generator

Browse Source
This commit is contained in:
Tom AUGIER
2021-06-05 17:36:04 +02:00
committed by GitHub
parent 6e26763dc7 17c4a9deaa
commit 638cdaa58c
38 changed files with 647 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Map/Map.cpp
View File

@@ -151,7 +151,7 @@ namespace BBM
scene->addEntity("Hole Block")
.addComponent<PositionComponent>(Vector3f(coords.x, coords.y - 1, coords.z))
.addComponent<Drawable3DComponent, RAY3D::Model>(holeObj, std::make_pair(MAP_DIFFUSE, holePng));
/* .addComponent<CollisionComponent>([](WAL::Entity &other, const WAL::Entity &entity) {
/*.addComponent<CollisionComponent>([](WAL::Entity &other, const WAL::Entity &entity) {
if (other.hasComponent<HealthComponent>()) {
auto &health = other.getComponent<HealthComponent>();
health.takeDmg(health.getHealthPoint());