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

Now using the easier/cleaner way of getting/setting the HealthProperties

Browse Source
This commit is contained in:
verysecrethero
2016-01-07 15:27:39 +01:00
parent 578ca13f79
commit e52c0c9633
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/HealthSystem.cpp
+4 -8
View File
@@ -13,8 +13,7 @@ void HealthSystem::UpdateComponent(World *world, ComponentWrapper &health, doubl
{ {
//if entityID of health is 9 then the players ID is also 9 (player,health are connected to the same entity) //if entityID of health is 9 then the players ID is also 9 (player,health are connected to the same entity)
ComponentWrapper player = world->GetComponent(health.EntityID, "Player"); ComponentWrapper player = world->GetComponent(health.EntityID, "Player");
double currentHealth; double maxHealth = (double)health["MaxHealth"];
double maxHealth = (double)world->GetComponent(health.EntityID, "Health")["MaxHealth"];
//process the DeltaHealthVector and change the entitys health accordingly //process the DeltaHealthVector and change the entitys health accordingly
for (size_t i = m_DeltaHealthVector.size(); i > 0; i--) for (size_t i = m_DeltaHealthVector.size(); i > 0; i--)
@@ -22,18 +21,15 @@ void HealthSystem::UpdateComponent(World *world, ComponentWrapper &health, doubl
auto deltaHP = m_DeltaHealthVector[i - 1]; auto deltaHP = m_DeltaHealthVector[i - 1];
//if we have a healthchange for the current player, then apply it //if we have a healthchange for the current player, then apply it
if (std::get<0>(deltaHP) == player.EntityID) { if (std::get<0>(deltaHP) == player.EntityID) {
//re-read currentHealth for each iteration
currentHealth = (double)world->GetComponent(health.EntityID, "Health")["Health"];
//get the deltaHP value from the tuple and make sure you dont get more than maxHealth //get the deltaHP value from the tuple and make sure you dont get more than maxHealth
double newHealth = std::min(currentHealth + (double)std::get<1>(deltaHP), maxHealth); double newHealth = std::min((double)health["Health"] + (double)std::get<1>(deltaHP), maxHealth);
health.SetProperty("Health", newHealth); health["Health"] = newHealth;
m_DeltaHealthVector.erase(m_DeltaHealthVector.begin() + i - 1); m_DeltaHealthVector.erase(m_DeltaHealthVector.begin() + i - 1);
} }
} }
currentHealth = (double)world->GetComponent(health.EntityID, "Health")["Health"];
//check if health is <= 0 //check if health is <= 0
if (currentHealth <= 0.0f) { if ((double)health["Health"] <= 0.0f) {
//publish death event //publish death event
Events::PlayerDeath e; Events::PlayerDeath e;
e.PlayerID = player.EntityID; e.PlayerID = player.EntityID;