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

Fix: No buggy teamstates for 16-player clients

Browse source
This commit is contained in:
def 2014-01-22 15:29:30 +01:00
parent 61b056f9f7
commit 61ca36b4b3
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/game/server/teams.cpp
View file

@ -190,8 +190,7 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
for (int LoopClientID = 0; LoopClientID < MAX_CLIENTS; ++LoopClientID)
if (GetPlayer(LoopClientID))
if (GetPlayer(LoopClientID)->m_IsUsingDDRaceClient)
SendTeamsState(LoopClientID);
SendTeamsState(LoopClientID);
}
void CGameTeams::ForceLeaveTeam(int ClientID)
@ -306,22 +305,13 @@ void CGameTeams::SendTeamsState(int ClientID)
if (g_Config.m_SvTeam == 3)
return;
if (!((CServer *) Server())->m_aClients[ClientID].m_CustClt)
return;
CMsgPacker Msg(NETMSGTYPE_SV_TEAMSSTATE);
if (((CServer *) Server())->m_aClients[ClientID].m_CustClt)
{
for(unsigned i = 0; i < MAX_CLIENTS; i++)
Msg.AddInt(m_Core.Team(i));
}
else
{
for(unsigned i = 0; i < VANILLA_MAX_CLIENTS; i++)
{
int id = i;
Server()->ReverseTranslate(id, ClientID);
Msg.AddInt(m_Core.Team(id));
}
}
for(unsigned i = 0; i < MAX_CLIENTS; i++)
Msg.AddInt(m_Core.Team(i));
Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
}