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

Merge fixes

Browse Source
This commit is contained in:
viktorljung
2016-03-13 16:14:13 +01:00
parent 44f46cda8d
commit 04288e5243
10 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/BoostIconsHUDSystem.cpp
+6 -6
View File
@@ -12,9 +12,9 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
if (assaultEntity.HasComponent("Fill")) {
EntityWrapper assaultBoost = player.FirstChildByName("BoostAssault");
if (assaultBoost.Valid()) {
(double&)assaultEntity["Fill"]["Percentage"] = 1.0;
(Field<double>)assaultEntity["Fill"]["Percentage"] = 1.0;
} else {
(double&)assaultEntity["Fill"]["Percentage"] = 0.0;
(Field<double>)assaultEntity["Fill"]["Percentage"] = 0.0;
}
}
}
@@ -23,9 +23,9 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
if (defenderEntity.HasComponent("Fill")) {
EntityWrapper defenderBoost = player.FirstChildByName("BoostDefender");
if (defenderBoost.Valid()) {
(double&)defenderEntity["Fill"]["Percentage"] = 1.0;
(Field<double>)defenderEntity["Fill"]["Percentage"] = 1.0;
} else {
(double&)defenderEntity["Fill"]["Percentage"] = 0.0;
(Field<double>)defenderEntity["Fill"]["Percentage"] = 0.0;
}
}
}
@@ -34,9 +34,9 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
if (sniperEntity.HasComponent("Fill")) {
EntityWrapper sniperBoost = player.FirstChildByName("BoostSniper");
if (sniperBoost.Valid()) {
(double&)sniperEntity["Fill"]["Percentage"] = 1.0;
(Field<double>)sniperEntity["Fill"]["Percentage"] = 1.0;
} else {
(double&)sniperEntity["Fill"]["Percentage"] = 0.0;
(Field<double>)sniperEntity["Fill"]["Percentage"] = 0.0;
}
}
}