mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11361] Add and use max arena team size function instead direct code.

Browse source
This commit is contained in:
VladimirMangos 2011-04-15 18:39:52 +04:00
parent b9240d04e3
commit bacb39a724
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/ArenaTeam.cpp
View file

@ -107,7 +107,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
uint8 plClass; uint8 plClass;
// arena team is full (can't have more than type * 2 players!) // arena team is full (can't have more than type * 2 players!)
if (GetMembersSize() >= GetType() * 2) if (GetMembersSize() >= GetMaxMembersSize())
return false; return false;
Player *pl = sObjectMgr.GetPlayer(playerGuid); Player *pl = sObjectMgr.GetPlayer(playerGuid);

1
src/game/ArenaTeam.h
View file

@ -147,6 +147,7 @@ class ArenaTeam
void SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor); void SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor);
size_t GetMembersSize() const { return m_members.size(); } size_t GetMembersSize() const { return m_members.size(); }
size_t GetMaxMembersSize() const { return size_t(GetType() * 2); }
bool Empty() const { return m_members.empty(); } bool Empty() const { return m_members.empty(); }
MemberList::iterator m_membersBegin() { return m_members.begin(); } MemberList::iterator m_membersBegin() { return m_members.begin(); }
MemberList::iterator m_membersEnd() { return m_members.end(); } MemberList::iterator m_membersEnd() { return m_members.end(); }

2
src/game/ArenaTeamHandler.cpp
View file

@ -132,7 +132,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
return; return;
} }
if(arenateam->GetMembersSize() >= arenateam->GetType() * 2) if(arenateam->GetMembersSize() >= arenateam->GetMaxMembersSize())
{ {
SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, arenateam->GetName(), "", ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S); SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, arenateam->GetName(), "", ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S);
return; return;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11360" #define REVISION_NR "11361"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__