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

Ensure that team state is always sent

Browse source
This commit is contained in:
trml 2020-06-23 23:54:17 +02:00
parent 3ba2d3a867
commit ca36f4787c
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,8 +268,6 @@ bool CGameTeams::SetCharacterTeam(int ClientID, int Team)
void CGameTeams::SetForceCharacterTeam(int ClientID, int Team) void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
{ {
int OldTeam = m_Core.Team(ClientID);
if (Team != m_Core.Team(ClientID)) if (Team != m_Core.Team(ClientID))
ForceLeaveTeam(ClientID); ForceLeaveTeam(ClientID);
else else
@ -280,6 +278,13 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
} }
SetForceCharacterNewTeam(ClientID, Team); SetForceCharacterNewTeam(ClientID, Team);
}
void CGameTeams::SetForceCharacterNewTeam(int ClientID, int Team)
{
int OldTeam = m_Core.Team(ClientID);
m_Core.Team(ClientID, Team);
if (OldTeam != Team) if (OldTeam != Team)
{ {
@ -290,11 +295,6 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
if(GetPlayer(ClientID)) if(GetPlayer(ClientID))
GetPlayer(ClientID)->m_VotedForPractice = false; GetPlayer(ClientID)->m_VotedForPractice = false;
} }
}
void CGameTeams::SetForceCharacterNewTeam(int ClientID, int Team)
{
m_Core.Team(ClientID, Team);
if (m_Core.Team(ClientID) != TEAM_SUPER) if (m_Core.Team(ClientID) != TEAM_SUPER)
m_MembersCount[m_Core.Team(ClientID)]++; m_MembersCount[m_Core.Team(ClientID)]++;
@ -741,15 +741,19 @@ void CGameTeams::ProcessSaveTeam()
void CGameTeams::OnCharacterSpawn(int ClientID) void CGameTeams::OnCharacterSpawn(int ClientID)
{ {
m_Core.SetSolo(ClientID, false); m_Core.SetSolo(ClientID, false);
int Team = m_Core.Team(ClientID);
if(GetSaving(m_Core.Team(ClientID))) if(GetSaving(Team))
return; return;
if (m_Core.Team(ClientID) >= TEAM_SUPER || !m_TeamLocked[m_Core.Team(ClientID)]) if (m_Core.Team(ClientID) >= TEAM_SUPER || !m_TeamLocked[Team])
{
// Important to only set a new team here, don't remove from an existing // Important to only set a new team here, don't remove from an existing
// team since a newly joined player does by definition not have an old team // team since a newly joined player does by definition not have an old team
// to remove from. Doing so would destroy the count in m_MembersCount. // to remove from. Doing so would destroy the count in m_MembersCount.
SetForceCharacterNewTeam(ClientID, 0); SetForceCharacterNewTeam(ClientID, 0);
CheckTeamFinished(Team);
}
} }
void CGameTeams::OnCharacterDeath(int ClientID, int Weapon) void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)