aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Groups/Group.cpp
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2017-06-12 17:01:47 +0200
committerCarbenium <carbenium@outlook.com>2020-07-16 22:00:29 +0200
commit17a0139b0e121b0d8d0f2a079fcfd49090ea35a4 (patch)
treee977db12ec29882be66f3251fe2d0718671dd01f /src/server/game/Groups/Group.cpp
parent7df8546d7ef5c31b401f01811186116d9ae402c4 (diff)
- Add new commands .group set assistant, .group set maintank and .group set mainassist to toggle raid member flags.
- Fix 2017_05_29_00_auth.sql to be reapply safe. (cherry picked from commit ac0f76f8c57bba195b773a6a31ade2e8e2318aeb)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
-rw-r--r--src/server/game/Groups/Group.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 24f8a2ac541..bf6a23692fe 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -2501,12 +2501,12 @@ ObjectGuid Group::GetMemberGUID(const std::string& name)
return ObjectGuid::Empty;
}
-bool Group::IsAssistant(ObjectGuid guid) const
+uint8 Group::GetMemberFlags(ObjectGuid guid) const
{
member_citerator mslot = _getMemberCSlot(guid);
if (mslot == m_memberSlots.end())
- return false;
- return mslot->flags & MEMBER_FLAG_ASSISTANT;
+ return 0u;
+ return mslot->flags;
}
bool Group::SameSubGroup(ObjectGuid guid1, ObjectGuid guid2) const
@@ -2560,7 +2560,8 @@ void Group::SetGroupMemberFlag(ObjectGuid guid, bool apply, GroupMemberFlags fla
return;
// Do flag specific actions, e.g ensure uniqueness
- switch (flag) {
+ switch (flag)
+ {
case MEMBER_FLAG_MAINASSIST:
RemoveUniqueGroupMemberFlag(MEMBER_FLAG_MAINASSIST); // Remove main assist flag from current if any.
break;