Build fix

This commit is contained in:
Shauren
2012-06-12 20:17:55 +02:00
parent 76a2d13239
commit b24c15740f
5 changed files with 9 additions and 19 deletions
+1 -1
View File
@@ -23386,7 +23386,7 @@ PartyResult Player::CanUninviteFromGroup() const
return ERR_PARTY_LFG_BOOT_LOOT_ROLLS;
// TODO: Should also be sent when anyone has recently left combat, with an aprox ~5 seconds timer.
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
for (GroupReference const* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
if (itr->getSource() && itr->getSource()->isInCombat())
return ERR_PARTY_LFG_BOOT_IN_COMBAT;
-14
View File
@@ -2076,20 +2076,6 @@ bool Group::HasFreeSlotSubGroup(uint8 subgroup) const
return (m_subGroupsCounts && m_subGroupsCounts[subgroup] < MAXGROUPSIZE);
}
Group::MemberSlotList const& Group::GetMemberSlots() const
{
return m_memberSlots;
}
GroupReference* Group::GetFirstMember()
{
return m_memberMgr.getFirst();
}
uint32 Group::GetMembersCount() const
{
return m_memberSlots.size();
}
uint8 Group::GetMemberGroup(uint64 guid) const
{
+5 -3
View File
@@ -230,9 +230,11 @@ class Group
bool SameSubGroup(Player const* member1, Player const* member2) const;
bool HasFreeSlotSubGroup(uint8 subgroup) const;
MemberSlotList const& GetMemberSlots() const;
GroupReference* GetFirstMember();
uint32 GetMembersCount() const;
MemberSlotList const& GetMemberSlots() const { return m_memberSlots; }
GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); }
GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); }
uint32 GetMembersCount() const { return m_memberSlots.size(); }
uint8 GetMemberGroup(uint64 guid) const;
void ConvertToLFG();
+2 -1
View File
@@ -28,7 +28,8 @@ class GroupReference;
class GroupRefManager : public RefManager<Group, Player>
{
public:
GroupReference* getFirst() { return ((GroupReference*) RefManager<Group, Player>::getFirst()); }
GroupReference* getFirst() { return ((GroupReference*)RefManager<Group, Player>::getFirst()); }
GroupReference const* getFirst() const { return ((GroupReference const*)RefManager<Group, Player>::getFirst()); }
};
#endif
+1
View File
@@ -35,6 +35,7 @@ class GroupReference : public Reference<Group, Player>
GroupReference() : Reference<Group, Player>(), iSubGroup(0) {}
~GroupReference() { unlink(); }
GroupReference* next() { return (GroupReference*)Reference<Group, Player>::next(); }
GroupReference const* next() const { return (GroupReference const*)Reference<Group, Player>::next(); }
uint8 getSubGroup() const { return iSubGroup; }
void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
};