Merging with develop

This commit is contained in:
Zoe Roux
2021-06-07 21:58:07 +02:00
23 changed files with 255 additions and 75 deletions
+4 -7
View File
@@ -6,14 +6,11 @@
#include "HealthComponent.hpp"
#include <utility>
namespace BBM
{
HealthComponent::HealthComponent(WAL::Entity &entity)
: WAL::Component(entity),
_healthPoint()
{}
HealthComponent::HealthComponent(WAL::Entity &entity, unsigned int healthPoint, WAL::Callback<WAL::Entity &> onDeath)
HealthComponent::HealthComponent(WAL::Entity &entity, unsigned int healthPoint, const WAL::Callback<WAL::Entity &> &onDeath)
: WAL::Component(entity),
_healthPoint(healthPoint),
onDeath(onDeath)
@@ -21,7 +18,7 @@ namespace BBM
WAL::Component *HealthComponent::clone(WAL::Entity &entity) const
{
return new HealthComponent(entity);
return new HealthComponent(entity, this->_healthPoint, this->onDeath);
}
void HealthComponent::addHealthPoint(unsigned int healthPoint)