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' of github.com:AnonymusRaccoon/Bomberman into collision_check_clem

Browse Source 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Map/Map.hpp
This commit is contained in:
Clément Le Bihan
2021-06-08 16:19:32 +02:00
parent 395566598c 580625492f
commit f74c053c80
25 changed files with 531 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/Map/Map.cpp
View File

@@ -28,6 +28,11 @@ namespace BBM
mov->_velocity.z = 0;
}
void MapGenerator::wallDestroyed(WAL::Entity &entity)
{
entity.scheduleDeletion();
}
const std::string MapGenerator::assetsPath = "./assets/";
const std::string MapGenerator::wallAssetsPath = MapGenerator::assetsPath + "map/";
const std::string MapGenerator::imageExtension = ".png";
@@ -143,7 +148,7 @@ namespace BBM
scene->addEntity("Breakable Block")
.addComponent<PositionComponent>(coords)
.addComponent<HealthComponent>(1)
.addComponent<HealthComponent>(1, &MapGenerator::wallDestroyed)
.addComponent<CollisionComponent>(
WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
&MapGenerator::wallCollide, 0.25, .75)