Changeset 28 for trunk/src/game/Unit.cpp

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

[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

Original author: Neo2003
Date: 2008-10-09 08:42:22-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/Unit.cpp

    r9 r28  
    471471            RemoveSpellsCausingAura(SPELL_AURA_MOD_INVISIBILITY); 
    472472 
    473         if(pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNDED)) 
     473        if(pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED)) 
    474474            pVictim->SetStandState(PLAYER_STATE_NONE); 
    475475    } 
     
    21502150void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool extra ) 
    21512151{ 
    2152     if(hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_STUNDED | UNIT_STAT_FLEEING) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED) ) 
     2152    if(hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_STUNNED | UNIT_STAT_FLEEING) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED) ) 
    21532153        return; 
    21542154 
     
    29622962float Unit::GetUnitDodgeChance() const 
    29632963{ 
    2964     if(hasUnitState(UNIT_STAT_STUNDED)) 
     2964    if(hasUnitState(UNIT_STAT_STUNNED)) 
    29652965        return 0.0f; 
    29662966    if( GetTypeId() == TYPEID_PLAYER ) 
     
    29812981float Unit::GetUnitParryChance() const 
    29822982{ 
    2983     if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNDED)) 
     2983    if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNNED)) 
    29842984        return 0.0f; 
    29852985 
     
    30133013float Unit::GetUnitBlockChance() const 
    30143014{ 
    3015     if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNDED)) 
     3015    if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNNED)) 
    30163016        return 0.0f; 
    30173017 
     
    79867986    if (spellInfo->Mechanic == MECHANIC_FEAR ) 
    79877987    { 
    7988         if ( hasUnitState(UNIT_STAT_STUNDED) ) 
     7988        if ( hasUnitState(UNIT_STAT_STUNNED) ) 
    79897989            return true; 
    79907990    } 
     
    86638663 
    86648664    //If a mob or player is stunned he will not be able to detect stealth 
    8665     if (u->hasUnitState(UNIT_STAT_STUNDED) && (u != this)) 
     8665    if (u->hasUnitState(UNIT_STAT_STUNNED) && (u != this)) 
    86668666        return false; 
    86678667 
     
    91379137    if(target) 
    91389138    { 
    9139         if(!hasUnitState(UNIT_STAT_STUNDED)) 
     9139        if(!hasUnitState(UNIT_STAT_STUNNED)) 
    91409140            SetInFront(target); 
    91419141        ((Creature*)this)->AI()->AttackStart(target);