Some fixes to the Player and map, added skeleton system for the ScoreScreen

2016-03-03 00:55:44 +01:00
parent 050ce57e24
commit d74ae4e411
5 changed files with 802 additions and 742 deletions
@@ -18,6 +18,8 @@ void AbilityCooldownHUDSystem::Update(double dt)
        double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
        double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];

+        currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+
        if(cooldownTextEntity.Valid()) {
            if(cooldownTextEntity.HasComponent("Text"))
            {
@@ -25,7 +27,6 @@ void AbilityCooldownHUDSystem::Update(double dt)
            }
        }
        if (entity.HasComponent("Fill")) {
-            currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
            entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD;
        }
    }