diff options
| author | megamage <none@none> | 2009-01-23 14:23:25 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-23 14:23:25 -0600 |
| commit | f0ebb960642ad0fa43fa49fd3cc76f6516de6cd3 (patch) | |
| tree | a6fa76445cfa07bf060a473ad1910c724fa679a4 /src/game/Unit.h | |
| parent | b28b8b5ced6f0e0a7b52403010a7b465b5a765ae (diff) | |
| parent | c3ce24c30fc824d73f719780d7791a0095c14d61 (diff) | |
*Update to HG 957.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.h')
| -rw-r--r-- | src/game/Unit.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/Unit.h b/src/game/Unit.h index b2ff5287309..669bc8a405f 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1148,7 +1148,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeler); void RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer); void RemoveAurasDueToSpellByCancel(uint32 spellId); - void RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo); + void RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo, Unit * caster); void RemoveNotOwnSingleTargetAuras(); void RemoveSpellsCausingAura(AuraType auraType); @@ -1275,7 +1275,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void AddThreat(Unit* pVictim, float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *threatSpell = NULL); float ApplyTotalThreatModifier(float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL); void DeleteThreatList(); - bool SelectHostilTarget(); + //bool SelectHostilTarget(); void TauntApply(Unit* pVictim); void TauntFadeOut(Unit *taunter); ThreatManager& getThreatManager() { return m_ThreatManager; } @@ -1506,6 +1506,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint32 m_reactiveTimer[MAX_REACTIVE]; uint32 m_regenTimer; + ThreatManager m_ThreatManager; private: void SendAttackStop(Unit* victim); // only from AttackStop(Unit*) //void SendAttackStart(Unit* pVictim); // only from Unit::AttackStart(Unit*) @@ -1525,7 +1526,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject Diminishing m_Diminishing; // Manage all Units threatening us - ThreatManager m_ThreatManager; +// ThreatManager m_ThreatManager; // Manage all Units that are threatened by us HostilRefManager m_HostilRefManager; |