Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

2016-03-13 22:02:45 +01:00
parent fd50ea3a12 83ae87594f
commit 98bd447084
1 changed files with 1 additions and 1 deletions
@@ -23,7 +23,7 @@ void HealthHUDSystem::Update(double dt)

            if (entity.HasComponent("Text")) {
                double health = (const double&)entityIDParent["Health"]["Health"];
-                double maxHealth = (const double&)entityIDParent["Health"]["Health"];
+                double maxHealth = (const double&)entityIDParent["Health"]["MaxHealth"];
                std::string s = "";
                s = s + std::to_string((int)health);
                s = s + "/";