edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed locking of team change buttons when spectator and team balance is enabled and joining a team would unbalance them

Browse source
This commit is contained in:
oy 2019-01-05 10:21:55 +01:00
parent 4912a0ccf8
commit f83d88135f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/client/components/menus_ingame.cpp
View file

@ -114,15 +114,10 @@ void CMenus::RenderGame(CUIRect MainView)
int RedTeamSizeNew = m_pClient->m_GameInfo.m_aTeamSize[TEAM_RED];
if(Team != TEAM_RED)
++RedTeamSizeNew;
else if(Team == TEAM_RED)
--RedTeamSizeNew;
int BlueTeamSizeNew = m_pClient->m_GameInfo.m_aTeamSize[TEAM_BLUE];
if(Team != TEAM_BLUE)
++BlueTeamSizeNew;
else if(Team == TEAM_BLUE)
if(Team == TEAM_BLUE)
--BlueTeamSizeNew;
bool BlockRed = m_pClient->m_ServerSettings.m_TeamBalance && (RedTeamSizeNew - BlueTeamSizeNew >= NUM_TEAMS);
bool BlockBlue = m_pClient->m_ServerSettings.m_TeamBalance && (BlueTeamSizeNew - RedTeamSizeNew >= NUM_TEAMS);
if((Info.m_aNotification[0] && Team != TEAM_RED) || BlockRed)
{
if(Info.m_TimeLeft)
@ -142,6 +137,13 @@ void CMenus::RenderGame(CUIRect MainView)
SetActive(false);
}
RedTeamSizeNew = m_pClient->m_GameInfo.m_aTeamSize[TEAM_RED];
if(Team == TEAM_RED)
--RedTeamSizeNew;
BlueTeamSizeNew = m_pClient->m_GameInfo.m_aTeamSize[TEAM_BLUE];
if(Team != TEAM_BLUE)
++BlueTeamSizeNew;
bool BlockBlue = m_pClient->m_ServerSettings.m_TeamBalance && (BlueTeamSizeNew - RedTeamSizeNew >= NUM_TEAMS);
if((Info.m_aNotification[0] && Team != TEAM_BLUE) || BlockBlue)
{
if(Info.m_TimeLeft)