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

4 files changed, 4 insertions, 4 deletions

diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 677a02b0187..8b306f1f148 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -120,7 +120,7 @@ public:
 
             //Teleporting Random Target to one of the six pre boss rooms and spawn 3-4 skeletons near the gamer.
             //We will only telport if gandling has more than 3% of hp so teleported gamers can always loot.
-            if (me->GetHealth()*100 / me->GetMaxHealth() > 3)
+            if (HealthAbovePct(3))
             {
                 if (Teleport_Timer <= diff)
                 {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 0bac76be60b..1915ac60f9e 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -96,7 +96,7 @@ public:
                 m_uiBackhand_Timer -= uiDiff;
 
             //Frenzy_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 26)
+            if (HealthBelowPct(26))
             {
                 if (m_uiFrenzy_Timer <= uiDiff)
                 {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 1f24d0511db..2524113d668 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -105,7 +105,7 @@ public:
             } else Minion_Timer -= diff;
 
             //Summon 2 Bone Mages
-            if (!Mages && me->GetHealth()*100 / me->GetMaxHealth() < 26)
+            if (!Mages && HealthBelowPct(26))
             {
                 //Cast
                 SummonMages(me->getVictim());
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 51e9df14349..e320d3aca3b 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -84,7 +84,7 @@ public:
                 m_uiBlastWave_Timer -= uiDiff;
 
             //Frenzy_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 25)
+            if (HealthBelowPct(25))
             {
                 if (m_uiFrenzy_Timer <= uiDiff)
                 {