Changeset 158

Show
Ignore:
Timestamp:
11/19/08 13:41:39 (17 years ago)
Author:
yumileroy
Message:

[svn] Replace many IsWithinDistInMap? with IsWithinCombatDist? in melee attack function.

Original author: megamage
Date: 2008-11-03 17:39:34-06:00

Location:
trunk/src/bindings/scripts/scripts
Files:
16 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp

    r90 r158  
    4343    void Aggro(Unit *who) 
    4444    { 
    45             if (!m_creature->IsWithinDistInMap(who, ATTACK_DISTANCE)) 
     45            if (!m_creature->IsWithinCombatDist(who, ATTACK_DISTANCE)) 
    4646            { 
    4747                IsSelfRooted = true; 
    … …  
    8282 
    8383        //If we are within range melee the target 
    84         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     84        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    8585        { 
    8686            //Make sure our attack is ready and we arn't currently casting 

  • trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp

    r90 r158  
    8787    { 
    8888        //If we are within range melee the target 
    89         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     89        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    9090        { 
    9191            bool Healing = false; 

  • trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp

    r90 r158  
    213213    { 
    214214        //If we are within range melee the target 
    215         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     215        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    216216        { 
    217217            if( m_creature->isAttackReady() ) 

  • trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp

    r115 r158  
    101101        if (Resonance_Timer < diff) 
    102102        { 
    103             if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     103            if (!m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    104104                DoCast(m_creature->getVictim(), SPELL_RESONANCE); 
    105105            Resonance_Timer = 5000; 

  • trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp

    r141 r158  
    18361836    void DoMeleeAttackIfReady() 
    18371837    { 
    1838         if( m_creature->isAttackReady() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     1838        if( m_creature->isAttackReady() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    18391839        { 
    18401840            if(!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND, 0)) 

  • trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp

    r90 r158  
    246246        { 
    247247            Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); 
    248             if(pUnit && m_creature->IsWithinDistInMap(pUnit, ATTACK_DISTANCE)) 
     248            if(pUnit && m_creature->IsWithinCombatDist(pUnit, ATTACK_DISTANCE)) 
    249249            { 
    250250                if(pUnit->GetHealth() > health) 

  • trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp

    r98 r158  
    244244                target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); 
    245245 
    246                 if (target && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     246                if (target && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    247247                    DoCast(target,SPELL_HURTFUL_STRIKE); 
    248248                else 

  • trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp

    r109 r158  
    170170        { 
    171171            Unit* temp = NULL; 
    172             if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE) ) 
     172            if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE) ) 
    173173                temp = m_creature->getVictim(); 
    174174            else temp = SelectUnit(SELECT_TARGET_RANDOM,0); 

  • trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp

    r105 r158  
    613613    void DoMeleeAttacksIfReady() 
    614614    { 
    615         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE) && !m_creature->IsNonMeleeSpellCasted(false)) 
     615        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE) && !m_creature->IsNonMeleeSpellCasted(false)) 
    616616        { 
    617617            //Check for base attack 

  • trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp

    r90 r158  
    275275 
    276276        //If we are within range melee the target 
    277         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     277        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    278278        { 
    279279            //Make sure our attack is ready and we arn't currently casting 

  • trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp

    r90 r158  
    172172                } 
    173173 
    174                 if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     174                if( phase!=2 && m_creature->getVictim() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    175175                { 
    176176                    if( m_creature->isAttackReady() ) 

  • trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp

    r90 r158  
    121121            return; 
    122122 
    123         if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     123        if (m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    124124        { 
    125125            //when hp <= 20% gain enrage 

  • trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp

    r117 r158  
    327327        {    
    328328            //If we are within range melee the target 
    329             if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     329            if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    330330            { 
    331331                HandleTouchedSpells(m_creature->getVictim(), SPELL_DARK_TOUCHED); 
    … …  
    740740            {    
    741741                //If we are within range melee the target 
    742                 if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     742                if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    743743                { 
    744744                    DoCast(m_creature->getVictim(),SPELL_DARK_STRIKE); 

  • trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp

    r117 r158  
    398398        if(m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false)) 
    399399        { 
    400             if(m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     400            if(m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    401401            { 
    402402                m_creature->AttackerStateUpdate(m_creature->getVictim()); 

  • trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp

    r90 r158  
    149149 
    150150        //If we are within range melee the target 
    151         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     151        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    152152        { 
    153153            //Make sure our attack is ready and we arn't currently casting 

  • trunk/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp

    r153 r158  
    269269        if( !m_creature->IsNonMeleeSpellCasted(false)) 
    270270        { 
    271             if(m_creature->isAttackReady() && m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     271            if(m_creature->isAttackReady() && m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    272272            { 
    273273                if(Phase == 1 && !Overpower_Timer) 
    … …  
    614614    { 
    615615        //if the vortex reach the target, it change his target to another player 
    616         if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) 
     616        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) 
    617617            AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0)); 
    618618    }