Core/Groups: Add kicker and kick reason to RemoveMember

--HG--
branch : trunk
This commit is contained in:
Spp
2010-11-23 20:49:36 +01:00
parent f25cbacf72
commit d3c9478153
8 changed files with 14 additions and 14 deletions
+2 -2
View File
@@ -2593,11 +2593,11 @@ void Player::UninviteFromGroup()
}
}
void Player::RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method /* = GROUP_REMOVEMETHOD_DEFAULT*/)
void Player::RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method /* = GROUP_REMOVEMETHOD_DEFAULT*/, uint64 kicker /* = 0 */, const char* reason /* = NULL */)
{
if (group)
{
if (group->RemoveMember(guid, method) <= 1)
if (group->RemoveMember(guid, method, kicker, reason) <= 1)
{
// group->Disband(); already disbanded in RemoveMember
sObjectMgr.RemoveGroup(group);
+1 -1
View File
@@ -1710,7 +1710,7 @@ class Player : public Unit, public GridObject<Player>
bool IsInSameGroupWith(Player const* p) const;
bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); }
void UninviteFromGroup();
static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT);
static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0 , const char* reason = NULL);
void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(),GetGUID(), method); }
void SendUpdateToOutOfRangeGroupMembers();