diff --git a/zone/groups.cpp b/zone/groups.cpp index 24904c5bc..e5bebee0b 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -1280,7 +1280,7 @@ void Client::LeaveGroup() { if (database.botdb.GetOwnerID(botID) == CharacterID()) { MemberCount -= 1; } - } + } } } @@ -2472,55 +2472,61 @@ bool Group::AmIPuller(const char *mob_name) return !((bool)PullerName.compare(mob_name)); } -bool Group::HasRole(Mob *m, uint8 Role) +bool Group::HasRole(Mob* m, uint8 Role) { - if(!m) - return false; + if (!m) { + return false; + } - for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) - { - if((m == members[i]) && (MemberRoles[i] & Role)) - return true; - } - return false; + for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) { + if (m == members[i] && MemberRoles[i] & Role) { + return true; + } + } + + return false; } -uint8 Group::GetMemberRole(Mob *m) +uint8 Group::GetMemberRole(Mob* m) { - if(!m) - return 0; + if (!m) { + return 0; + } - for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) - { - if(m == members[i]) - { - uint8 role = MemberRoles[i]; - if(m == leader) - role |= RoleLeader; - return role; - } - } + for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) { + if (m == members[i]) { + uint8 role = MemberRoles[i]; - return 0; + if (m == leader) { + role |= RoleLeader; + } + + return role; + } + } + + return 0; } -uint8 Group::GetMemberRole(const char *name) +uint8 Group::GetMemberRole(const char* name) { - if(!name) - return 0; + if (!name) { + return 0; + } - for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) - { - if(!strcasecmp(membername[i], name)) - { - uint8 role = MemberRoles[i]; - if(leader && !strcasecmp(leader->GetName(), name)) - role |= RoleLeader; - return role; - } - } + for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) { + if (!strcasecmp(membername[i], name)) { + uint8 role = MemberRoles[i]; - return 0; + if (leader && !strcasecmp(leader->GetName(), name)) { + role |= RoleLeader; + } + + return role; + } + } + + return 0; } void Group::QueueClients(Mob *sender, const EQApplicationPacket *app, bool ack_required /*= true*/, bool ignore_sender /*= true*/, float distance /*= 0*/) { diff --git a/zone/groups.h b/zone/groups.h index 35f909ea6..aeb511085 100644 --- a/zone/groups.h +++ b/zone/groups.h @@ -30,7 +30,12 @@ class Mob; #define MAX_MARKED_NPCS 3 -enum { RoleAssist = 1, RoleTank = 2, RolePuller = 4, RoleLeader = 8 }; +enum { + RoleAssist = 1, + RoleTank = 2, + RolePuller = 4, + RoleLeader = 8 +}; class GroupIDConsumer { public: @@ -119,8 +124,8 @@ public: void SetGroupTankTarget(Mob *m); void SetGroupPullerTarget(Mob *m); bool HasRole(Mob *m, uint8 Role); - uint8 GetMemberRole(Mob *m); - uint8 GetMemberRole(const char *name); + uint8 GetMemberRole(Mob* m); + uint8 GetMemberRole(const char* name); void NotifyAssistTarget(Client *c); void NotifyTankTarget(Client *c); void NotifyPullerTarget(Client *c); diff --git a/zone/lua_group.cpp b/zone/lua_group.cpp index 7a60f09b7..4b12ebcc6 100644 --- a/zone/lua_group.cpp +++ b/zone/lua_group.cpp @@ -163,11 +163,11 @@ luabind::scope lua_register_group() { .def("GetID", (int(Lua_Group::*)(void))&Lua_Group::GetID) .def("GetLeader", (Lua_Mob(Lua_Group::*)(void))&Lua_Group::GetLeader) .def("GetLeaderName", (const char*(Lua_Group::*)(void))&Lua_Group::GetLeaderName) - .def("GetLowestLevel", (uint32(Lua_Group::*)(void))&Lua_Group::GetLowestLevel) - .def("GetMember", (Lua_Mob(Lua_Group::*)(int))&Lua_Group::GetMember) - .def("GetMemberRole", (uint8(Lua_Group::*)(Lua_Mob))&Lua_Group::GetMemberRole) - .def("GetMemberRole", (uint8(Lua_Group::*)(const char*))&Lua_Group::GetMemberRole) - .def("GetTotalGroupDamage", (uint32(Lua_Group::*)(Lua_Mob))&Lua_Group::GetTotalGroupDamage) + .def("GetLowestLevel", (uint32(Lua_Group::*)(void)) &Lua_Group::GetLowestLevel) + .def("GetMember", (Lua_Mob(Lua_Group::*)(int)) &Lua_Group::GetMember) + .def("GetMemberRole", (uint8(Lua_Group::*)(Lua_Mob)) &Lua_Group::GetMemberRole) + .def("GetMemberRole", (uint8(Lua_Group::*)(const char*)) &Lua_Group::GetMemberRole) + .def("GetTotalGroupDamage", (uint32(Lua_Group::*)(Lua_Mob)) &Lua_Group::GetTotalGroupDamage) .def("GroupCount", (int(Lua_Group::*)(void))&Lua_Group::GroupCount) .def("GroupMessage", (void(Lua_Group::*)(Lua_Mob,const char*))&Lua_Group::GroupMessage) .def("GroupMessage", (void(Lua_Group::*)(Lua_Mob,uint8,const char*))&Lua_Group::GroupMessage) diff --git a/zone/lua_group.h b/zone/lua_group.h index b9275ed75..ee4e353bc 100644 --- a/zone/lua_group.h +++ b/zone/lua_group.h @@ -47,12 +47,12 @@ public: uint32 GetHighestLevel(); uint32 GetLowestLevel(); void TeleportGroup(Lua_Mob sender, uint32 zone_id, uint32 instance_id, float x, float y, float z, float h); - int GetID(); - Lua_Mob GetMember(int member_index); - uint8 GetMemberRole(Lua_Mob member); - uint8 GetMemberRole(const char* name); - bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name); - bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name, int max_check_count); + int GetID(); + Lua_Mob GetMember(int member_index); + uint8 GetMemberRole(Lua_Mob member); + uint8 GetMemberRole(const char* name); + bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name); + bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name, int max_check_count); }; #endif diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index b93e8ce70..2ea01cd54 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -129,12 +129,12 @@ Client* Perl_Group_GetMember(Group* self, int member_index) // @categories Accou uint8_t Perl_Group_GetMemberRole(Group* self, Mob* member) // @categories Account and Character, Script Utility, Group { - return self->GetMemberRole(member); + return self->GetMemberRole(member); } uint8_t Perl_Group_GetMemberRole(Group* self, const char* name) // @categories Account and Character, Script Utility, Group { - return self->GetMemberRole(name); + return self->GetMemberRole(name); } bool Perl_Group_DoesAnyMemberHaveExpeditionLockout(Group* self, std::string expedition_name, std::string event_name) @@ -171,11 +171,11 @@ void perl_register_group() package.add("GetID", &Perl_Group_GetID); package.add("GetLeader", &Perl_Group_GetLeader); package.add("GetLeaderName", &Perl_Group_GetLeaderName); - package.add("GetLowestLevel", &Perl_Group_GetLowestLevel); - package.add("GetMember", &Perl_Group_GetMember); - package.add("GetMemberRole", (uint8_t(*)(Group*, Mob*))&Perl_Group_GetMemberRole); - package.add("GetMemberRole", (uint8_t(*)(Group*, const char*))&Perl_Group_GetMemberRole); - package.add("GetTotalGroupDamage", &Perl_Group_GetTotalGroupDamage); + package.add("GetLowestLevel", &Perl_Group_GetLowestLevel); + package.add("GetMember", &Perl_Group_GetMember); + package.add("GetMemberRole", (uint8_t(*)(Group*, Mob*)) &Perl_Group_GetMemberRole); + package.add("GetMemberRole", (uint8_t(*)(Group*, const char*)) &Perl_Group_GetMemberRole); + package.add("GetTotalGroupDamage", &Perl_Group_GetTotalGroupDamage); package.add("GroupCount", &Perl_Group_GroupCount); package.add("GroupMessage", (void(*)(Group*, Mob*, const char*))&Perl_Group_GroupMessage); package.add("GroupMessage", (void(*)(Group*, Mob*, uint8_t, const char*))&Perl_Group_GroupMessage);