Core:

* add helping methods for manipulating unit's health and use it where applicable
* fix some conversion warnings and cleanup code (formatting, CRLF, tabs to spaces)

--HG--
branch : trunk

3 files changed, 4 insertions, 4 deletions

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 56117dd4733..0b900103e4e 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -334,7 +334,7 @@ public:
                     } else FlameStrikeTimer -= diff;
 
                     // Below 50%
-                    if (me->GetMaxHealth() * 0.5f > me->GetHealth())
+                    if (HealthBelowPct(50))
                     {
                         me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true);
                         me->StopMoving();
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index c4c63c038a0..7f3b23142e2 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -461,7 +461,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UsedPotion && (me->GetHealth()*100 / me->GetMaxHealth()) < 25)
+        if (!UsedPotion && HealthBelowPct(25))
         {
             DoCast(me, SPELL_HEALING_POTION);
             UsedPotion = true;
@@ -803,7 +803,7 @@ public:
                 }
             } else Polymorph_Timer -= diff;
 
-            if (((me->GetHealth()*100 / me->GetMaxHealth()) < 35) && !HasIceBlocked)
+            if (HealthBelowPct(35) && !HasIceBlocked)
             {
                 DoCast(me, SPELL_ICE_BLOCK);
                 HasIceBlocked = true;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 1bd20622d13..a1c4caaaea1 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -132,7 +132,7 @@ public:
             if (!Enraged)
             {
                 //used for check, when Vexallus cast adds 85%, 70%, 55%, 40%, 25%
-                if ((me->GetHealth()*100 / me->GetMaxHealth()) <= (100-(INTERVAL_MODIFIER*IntervalHealthAmount)))
+                if (!HealthAbovePct(100 - INTERVAL_MODIFIER * IntervalHealthAmount))
                 {
                     //increase amount, unless we're at 10%, then we switch and return
                     if (IntervalHealthAmount == INTERVAL_SWITCH)