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, 6 insertions, 6 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 5b43bbbfd10..c604659148c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -244,7 +244,7 @@ class boss_halazzi : public CreatureScript
                     if (Phase == PHASE_LYNX)
                         if (CheckTimer <= diff)
                         {
-                            if (me->GetHealth() * 4 < me->GetMaxHealth() * (3 - TransformCount))
+                            if (HealthBelowPct(25 * (3 - TransformCount)))
                                 EnterPhase(PHASE_SPLIT);
                             CheckTimer = 1000;
                         } else CheckTimer -= diff;
@@ -273,12 +273,12 @@ class boss_halazzi : public CreatureScript
                     if (Phase == PHASE_HUMAN)
                         if (CheckTimer <= diff)
                         {
-                            if (((me->GetHealth()*100) / me->GetMaxHealth() <= 20)/*me->GetHealth() * 10 < me->GetMaxHealth()*/)
+                            if (!HealthAbovePct(20) /*HealthBelowPct(10)*/)
                                 EnterPhase(PHASE_MERGE);
                             else
                             {
                                 Unit *Lynx = Unit::GetUnit(*me, LynxGUID);
-                                if (Lynx && ((Lynx->GetHealth()*100) / Lynx->GetMaxHealth() <= 20)/*Lynx->GetHealth() * 10 < Lynx->GetMaxHealth()*/)
+                                if (Lynx && !Lynx->HealthAbovePct(20) /*Lynx->HealthBelowPct(10)*/)
                                     EnterPhase(PHASE_MERGE);
                             }
                             CheckTimer = 1000;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index e5a98ee686d..5823b135a2d 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -344,7 +344,7 @@ class boss_janalai : public CreatureScript
                     return;
 
                 //enrage if under 25% hp before 5 min.
-                if (!enraged && me->GetHealth() * 4 < me->GetMaxHealth())
+                if (!enraged && HealthBelowPct(25))
                     EnrageTimer = 0;
 
                 if (EnrageTimer <= diff)
@@ -394,7 +394,7 @@ class boss_janalai : public CreatureScript
 
                 if (!noeggs)
                 {
-                    if (100 * me->GetHealth() < 35 * me->GetMaxHealth())
+                    if (HealthBelowPct(35))
                     {
                         DoScriptText(SAY_ALL_EGGS, me);
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 964ae32fb59..719264a4d6b 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -191,7 +191,7 @@ class boss_zuljin : public CreatureScript
 
                 Phase = 0;
 
-                health_20 = me->GetMaxHealth()*0.2f;
+                health_20 = me->CountPctFromMaxHealth(20);
 
                 Intro_Timer = 37000;
                 Berserk_Timer = 600000;