Cleanup

zone/groups.cpp

@@ -2474,29 +2474,33 @@ bool Group::AmIPuller(const char *mob_name)
 
 bool Group::HasRole(Mob* m, uint8 Role)
 {
-        if(!m)
+	if (!m) {
 		return false;
+	}
 
-        for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i)
+	for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) {
-        {
+		if (m == members[i] && MemberRoles[i] & Role) {
-                if((m == members[i]) && (MemberRoles[i] & Role))
 			return true;
 		}
+	}
+
 	return false;
 }
 
 uint8 Group::GetMemberRole(Mob* m)
 {
-        if(!m)
+	if (!m) {
 		return 0;
+	}
 
-        for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i)
+	for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) {
-        {
+		if (m == members[i]) {
-                if(m == members[i])
-                {
 			uint8 role = MemberRoles[i];
-                        if(m == leader)
+
+			if (m == leader) {
 				role |= RoleLeader;
+			}
+
 			return role;
 		}
 	}
@@ -2506,16 +2510,18 @@ uint8 Group::GetMemberRole(Mob *m)
 
 uint8 Group::GetMemberRole(const char* name)
 {
-        if(!name)
+	if (!name) {
 		return 0;
+	}
 
-        for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i)
+	for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) {
-        {
+		if (!strcasecmp(membername[i], name)) {
-                if(!strcasecmp(membername[i], name))
-                {
 			uint8 role = MemberRoles[i];
-                        if(leader && !strcasecmp(leader->GetName(), name))
+
+			if (leader && !strcasecmp(leader->GetName(), name)) {
 				role |= RoleLeader;
+			}
+
 			return role;
 		}
 	}

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: