Changeset 69 for trunk/src/game/Spell.cpp

Timestamp:

11/19/08 13:31:22 (17 years ago)

Author:

yumileroy

Message:

[svn] Add Unit::IsWithinCombatDist? function to check melee range and spell range (now range is related to the attacker's bounding_radius and target's combat_reach, not sure if both should be combat_reach).

Original author: megamage
Date: 2008-10-19 14:42:12-05:00

Files:

• trunk/src/game/Spell.cpp (modified) (1 diff)

trunk/src/game/Spell.cpp

@@ -4338 +4338 @@
     {
         // distance from target center in checks
-        float dist = m_caster->GetDistance(target->GetPositionX(),target->GetPositionY(),target->GetPositionZ());
-        if(dist > max_range)
+        if(!m_caster->IsWithinCombatDist(target, max_range))
             return SPELL_FAILED_OUT_OF_RANGE;               //0x5A;
-        if(dist < min_range)
+        if(min_range && m_caster->IsWithinCombatDist(target, min_range)) // skip this check if min_range = 0
             return SPELL_FAILED_TOO_CLOSE;
         if( m_caster->GetTypeId() == TYPEID_PLAYER &&