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

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.h

    r9 r28  
    347347    UNIT_STAT_MELEE_ATTACKING = 0x0002,                     // player is melee attacking someone 
    348348    //UNIT_STAT_MELEE_ATTACK_BY = 0x0004,                     // player is melee attack by someone 
    349     UNIT_STAT_STUNDED         = 0x0008, 
     349    UNIT_STAT_STUNNED         = 0x0008, 
    350350    UNIT_STAT_ROAMING         = 0x0010, 
    351351    UNIT_STAT_CHASE           = 0x0020, 
     
    757757        { 
    758758            return !hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING | UNIT_STAT_IN_FLIGHT | 
    759                 UNIT_STAT_ROOT | UNIT_STAT_STUNDED | UNIT_STAT_DISTRACTED ) && GetOwnerGUID()==0; 
     759                UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED ) && GetOwnerGUID()==0; 
    760760        } 
    761761