Changeset 215 for trunk

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

[svn] Fix some aura_interrupt_flags.

Original author: megamage
Date: 2008-11-11 20:50:03-06:00

Location:
trunk/src/game
Files:
3 modified

Legend:

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

    r213 r215  
    1660616606 
    1660716607    // prevent stealth flight 
    16608     RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LOOT); 
     16608    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK); 
    1660916609 
    1661016610    WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4); 
  • trunk/src/game/SpellEffects.cpp

    r214 r215  
    34803480        { 
    34813481            // Reveal action + get attack 
    3482             m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LOOT); 
     3482            m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK); 
    34833483            if (((Creature*)unitTarget)->AI()) 
    34843484                ((Creature*)unitTarget)->AI()->AttackStart(m_caster); 
  • trunk/src/game/Unit.h

    r213 r215  
    6868    AURA_INTERRUPT_FLAG_NOT_UNDERWATER      = 0x00000100,   // 8    removed by leaving water 
    6969    AURA_INTERRUPT_FLAG_NOT_SHEATHED        = 0x00000200,   // 9    removed by unsheathing 
    70     AURA_INTERRUPT_FLAG_LOOT                = 0x00000400,   // 10 
    71     AURA_INTERRUPT_FLAG_MOUNT               = 0x00000800,   // 11   removed by mounting 
     70    AURA_INTERRUPT_FLAG_TALK                = 0x00000400,   // 10   talk to npc / loot? action on creature 
     71    AURA_INTERRUPT_FLAG_USE                 = 0x00000800,   // 11   mine/use/open action on gameobject 
    7272    AURA_INTERRUPT_FLAG_ATTACK              = 0x00001000,   // 12   removed by attacking 
    7373    AURA_INTERRUPT_FLAG_CAST                = 0x00002000,   // 13   ??? 
     
    7575    AURA_INTERRUPT_FLAG_TRANSFORM           = 0x00008000,   // 15   removed by transform? 
    7676    AURA_INTERRUPT_FLAG_UNK16               = 0x00010000,   // 16 
    77     AURA_INTERRUPT_FLAG_UNK17               = 0x00020000,   // 17   misdirect, aspect, swim speed 
     77    AURA_INTERRUPT_FLAG_MOUNT               = 0x00020000,   // 17   misdirect, aspect, swim speed 
    7878    AURA_INTERRUPT_FLAG_NOT_SEATED          = 0x00040000,   // 18   removed by standing up 
    7979    AURA_INTERRUPT_FLAG_CHANGE_MAP          = 0x00080000,   // 19   leaving map/getting teleported