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

5 files changed, 6 insertions, 6 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 77719cc80a2..95f523268d4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -418,7 +418,7 @@ public:
             } else ThunderClap_Timer -= diff;
 
             //FireballVolley_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 51)
+            if (HealthBelowPct(51))
             {
                 if (FireballVolley_Timer <= diff)
                 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
index 135b774ad95..2b483b4ae43 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -105,7 +105,7 @@ public:
             } else Cleave_Timer -= diff;
 
             //Adds_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 21)
+            if (HealthBelowPct(21))
             {
                 if (Adds_Timer <= diff)
                 {
@@ -119,7 +119,7 @@ public:
             }
 
             //Summon Medics
-            if (!Medics && me->GetHealth()*100 / me->GetMaxHealth() < 21)
+            if (!Medics && HealthBelowPct(21))
             {
                 SummonMedics(me->getVictim());
                 SummonMedics(me->getVictim());
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
index da7ba6fa7d5..bf81f6144d9 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -77,7 +77,7 @@ public:
             } else GroundTremor_Timer -= diff;
 
             //Frenzy_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 51)
+            if (HealthBelowPct(51))
             {
                 if (Frenzy_Timer <= diff)
                 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
index 3ce46b15d9d..90fc17043dd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -77,7 +77,7 @@ public:
             } else FieryBurst_Timer -= diff;
 
             //WarStomp_Timer
-            if (me->GetHealth()*100 / me->GetMaxHealth() < 51)
+            if (HealthBelowPct(51))
             {
                 if (WarStomp_Timer <= diff)
                 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index 8f427c66fed..0d6fda9430f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -240,7 +240,7 @@ public:
             } else DemonArmor_Timer -= diff;
 
             //Summon Voidwalkers
-            if (!Voidwalkers && me->GetHealth()*100 / me->GetMaxHealth() < 51)
+            if (!Voidwalkers && HealthBelowPct(51))
             {
                 DoCast(me->getVictim(), SPELL_SUMMON_VOIDWALKERS, true);
                 Voidwalkers = true;