diff options
author | Kudlaty <none@none> | 2009-06-11 00:02:08 +0200 |
---|---|---|
committer | Kudlaty <none@none> | 2009-06-11 00:02:08 +0200 |
commit | 1eb6b25e55e369a7cc4e1154b246ae0541edb24f (patch) | |
tree | b678ba1d4b45d48da1107e1cfc878af3096d9a21 /src/game/Unit.h | |
parent | 8adcd1e93b2499dd70eca5d19cd96bd4beeda11d (diff) | |
parent | da067afe12b457e603fd9f3af6914764c48a07dd (diff) |
merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.h')
-rw-r--r-- | src/game/Unit.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/Unit.h b/src/game/Unit.h index 5dea3b3304b..039dabd791f 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1123,7 +1123,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject bool IsNeutralToAll() const; bool IsInPartyWith(Unit const* unit) const; bool IsInRaidWith(Unit const* unit) const; - void GetPartyMember(std::list<Unit*> &units, float dist); + void GetPartyMemberInDist(std::list<Unit*> &units, float dist); + void GetPartyMembers(std::list<Unit*> &units); void GetRaidMember(std::list<Unit*> &units, float dist); bool IsContestedGuard() const { @@ -1403,6 +1404,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void RemoveNotOwnSingleTargetAuras(); bool RemoveNoStackAurasDueToAura(Aura *Aur); void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = NULL); + void Unit::RemoveAurasWithFamily(uint32 family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID); void RemoveMovementImpairingAuras(); void RemoveAllAuras(); void RemoveArenaAuras(bool onleave = false); |