diff options
| author | treeston <treeston.mmoc@gmail.com> | 2017-06-12 17:01:47 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2020-07-16 22:00:29 +0200 |
| commit | 17a0139b0e121b0d8d0f2a079fcfd49090ea35a4 (patch) | |
| tree | e977db12ec29882be66f3251fe2d0718671dd01f /src/server/game/Groups | |
| parent | 7df8546d7ef5c31b401f01811186116d9ae402c4 (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')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.h | 6 |
2 files changed, 10 insertions, 5 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; diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index b5a6d4dd75e..14ad431f96c 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -310,7 +310,11 @@ class TC_GAME_API Group bool IsMember(ObjectGuid guid) const; bool IsLeader(ObjectGuid guid) const; ObjectGuid GetMemberGUID(const std::string& name); - bool IsAssistant(ObjectGuid guid) const; + uint8 GetMemberFlags(ObjectGuid guid) const; + bool IsAssistant(ObjectGuid guid) const + { + return (GetMemberFlags(guid) & MEMBER_FLAG_ASSISTANT) == MEMBER_FLAG_ASSISTANT; + } Player* GetInvited(ObjectGuid guid) const; Player* GetInvited(const std::string& name) const; |