(8814bcb6b) Null checks on GUIStyle fonts

2019-06-11 21:46:39 +03:00
parent 5f497543a4
commit c30f1de8f3
4 changed files with 41 additions and 33 deletions
@@ -285,7 +285,7 @@ namespace Barotrauma
            get { return spriteColor; }
        }

-        public bool IsFullCondition => MathUtils.NearlyEqual(Condition, MaxCondition);
+        public bool IsFullCondition => Condition >= MaxCondition;
        public float MaxCondition => Prefab.Health;
        public float ConditionPercentage => MathUtils.Percentage(Condition, MaxCondition);

@@ -304,7 +304,6 @@ namespace Barotrauma
                if (Indestructible) return;

                float prev = condition;
-
                condition = MathHelper.Clamp(value, 0.0f, Prefab.Health);
                if (condition == 0.0f && prev > 0.0f)
                {