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

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

[svn] Fix 146_world.sql. Do not use default for text. (Ignore this if you have successfully applied 146_world.sql)
Fix HandleAuraModIncreaseHealth?, also increase current health.
Merge from Mangos:
2008-11-02 10:53:27 854e0d64e3410b2a1eff6d56705f8e42b4291534 Do not split self caused damage.
(PART) 2008-10-31 12:45:22 e56b671979623570acd358a9b99aa169be22ffba Move tamed pet creating code to new function.

Original author: megamage
Date: 2008-11-04 09:23:06-06:00

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/game/Unit.h

    r149 r161  
    1111 * This program is distributed in the hope that it will be useful, 
    1212 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 * GNU General Public License for more details. 
    1515 * 
    … …  
    217217    HITINFO_RESIST              = 0x00000040,               // resisted atleast some damage 
    218218    HITINFO_CRITICALHIT         = 0x00000080, 
     219    HITINFO_UNK2                = 0x00000100,               // wotlk? 
     220    HITINFO_UNK3                = 0x00002000,               // wotlk? 
    219221    HITINFO_GLANCING            = 0x00004000, 
    220222    HITINFO_CRUSHING            = 0x00008000, 
    … …  
    513515    UNIT_NPC_FLAG_STABLEMASTER          = 0x00400000,       // 100% 
    514516    UNIT_NPC_FLAG_GUILD_BANKER          = 0x00800000,       // cause client to send 997 opcode 
    515     UNIT_NPC_FLAG_UNK3                  = 0x01000000,       // cause client to send 1015 opcode 
     517    UNIT_NPC_FLAG_SPELLCLICK            = 0x01000000,       // cause client to send 1015 opcode (spell click) 
    516518    UNIT_NPC_FLAG_GUARD                 = 0x10000000,       // custom flag for guards 
    517519    UNIT_NPC_FLAG_OUTDOORPVP            = 0x20000000,       // custom flag for outdoor pvp creatures 
    … …  
    648650        bool HasCommandState(CommandStates state) { return (m_CommandState == state); } 
    649651        void SetReactState(ReactStates st) { m_reactState = st; } 
    650                 ReactStates GetReactState() { return m_reactState; } 
    651                 bool HasReactState(ReactStates state) { return (m_reactState == state); } 
     652        ReactStates GetReactState() { return m_reactState; } 
     653        bool HasReactState(ReactStates state) { return (m_reactState == state); } 
    652654 
    653655        void InitPossessCreateSpells(); 
    … …  
    992994        CharmInfo* GetCharmInfo() { return m_charmInfo; } 
    993995        CharmInfo* InitCharmInfo(Unit* charm); 
     996 
     997        Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0); 
    994998 
    995999        bool AddAura(Aura *aur); 
    … …  
    13301334        bool HandleHasteAuraProc(Unit *pVictim, SpellEntry const *spellProto, uint32 effIndex, uint32 damage, Aura* triggredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown); 
    13311335        bool HandleOverrideClassScriptAuraProc(Unit *pVictim, int32 scriptId, uint32 damage, Aura* triggredByAura, SpellEntry const *procSpell,uint32 cooldown); 
     1336 
    13321337        uint32 m_state;                                     // Even derived shouldn't modify 
    13331338        uint32 m_CombatTimer;