BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc TestBranch testing

Browse Source
This commit is contained in:
verysecrethero
2016-02-22 17:46:49 +01:00
parent bac23f6e8c
commit 041c409128
10 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/HealthSystem.cpp
+6 -1
View File
@@ -13,8 +13,11 @@ HealthSystem::HealthSystem(SystemParams params)
void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHealth, double dt)
{
//LOG_INFO("<- health updatecomponent");
double& health = cHealth["Health"];
if (health <= 0.0) {
int healthInt = (int)health;
if (healthInt <= 0 && !entity.HasComponent("Lifetime")) {
LOG_INFO("-> health <= 0");
Events::PlayerDeath ePlayerDeath;
ePlayerDeath.Player = entity;
m_EventBroker->Publish(ePlayerDeath);
@@ -24,6 +27,7 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHea
bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
{
LOG_INFO("<- on player damage");
if (!IsServer && m_NetworkEnabled || !e.Victim.Valid()) {
return false;
}
@@ -31,6 +35,7 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
ComponentWrapper cHealth = e.Victim["Health"];
double& health = cHealth["Health"];
health -= e.Damage;
LOG_INFO("-> health onplayerdam");
return true;
}