From 341e6303effccfdbfb6b67ae0d8fe6933f56ed3b Mon Sep 17 00:00:00 2001 From: azazel Date: Thu, 26 Aug 2010 01:20:57 +0600 Subject: 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 --- src/server/scripts/Outland/nagrand.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Outland/nagrand.cpp') diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 6f511d2e787..6007dd17728 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -178,7 +178,7 @@ public: void DamageTaken(Unit *done_by, uint32 & damage) { - if (done_by->GetTypeId() == TYPEID_PLAYER && (me->GetHealth() - damage)*100 / me->GetMaxHealth() < 30) + if (done_by->GetTypeId() == TYPEID_PLAYER && me->HealthBelowPctDamaged(30, damage)) { if (!bReset && CAST_PLR(done_by)->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) { @@ -718,7 +718,7 @@ public: else m_uiChainLightningTimer -= uiDiff; - if (me->GetHealth()*100 < me->GetMaxHealth()*30) + if (HealthBelowPct(30)) { if (m_uiHealTimer <= uiDiff) { -- cgit v1.2.3