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

Keeping multiple states consistent is hard (fixes #2315)

Browse source 
let's go recount every time
This commit is contained in:
def 2020-06-24 09:23:07 +02:00
parent 2fb4d73103
commit 243be18fb4
4 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ void CGameTeams::Reset()
{
m_TeamState[i] = TEAMSTATE_EMPTY;
m_TeeFinished[i] = false;
m_MembersCount[i] = 0;
m_LastChat[i] = 0;
m_TeamLocked[i] = false;
m_Invited[i] = 0;
@ -271,17 +270,8 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
if (Team != m_Core.Team(ClientID))
ForceLeaveTeam(ClientID);
else
{
m_TeeFinished[ClientID] = false;
if (Count(m_Core.Team(ClientID)) > 0)
m_MembersCount[m_Core.Team(ClientID)]--;
}
SetForceCharacterNewTeam(ClientID, Team);
}
void CGameTeams::SetForceCharacterNewTeam(int ClientID, int Team)
{
int OldTeam = m_Core.Team(ClientID);
m_Core.Team(ClientID, Team);
@ -296,8 +286,6 @@ void CGameTeams::SetForceCharacterNewTeam(int ClientID, int Team)
GetPlayer(ClientID)->m_VotedForPractice = false;
}
if (m_Core.Team(ClientID) != TEAM_SUPER)
m_MembersCount[m_Core.Team(ClientID)]++;
if (Team != TEAM_SUPER && (m_TeamState[Team] == TEAMSTATE_EMPTY || m_TeamLocked[Team]))
{
if (!m_TeamLocked[Team])
@ -340,16 +328,20 @@ void CGameTeams::ForceLeaveTeam(int ClientID)
// do not reset SaveTeamResult, because it should be logged into teehistorian even if the team leaves
}
}
if (Count(m_Core.Team(ClientID)) > 0)
m_MembersCount[m_Core.Team(ClientID)]--;
}
int CGameTeams::Count(int Team) const
{
if (Team == TEAM_SUPER)
return -1;
return m_MembersCount[Team];
int Count = 0;
for (int i = 0; i < MAX_CLIENTS; ++i)
if (m_Core.Team(i) == Team)
Count++;
return Count;
}
void CGameTeams::ChangeTeamState(int Team, int State)
@ -716,12 +708,12 @@ void CGameTeams::ProcessSaveTeam()
break;
}
case CSqlSaveResult::SAVE_FAILED:
if(m_MembersCount[Team] > 0)
if(Count(Team) > 0)
m_pSaveTeamResult[Team]->m_SavedTeam.load(Team);
break;
case CSqlSaveResult::LOAD_SUCCESS:
{
if(m_MembersCount[Team] > 0)
if(Count(Team) > 0)
m_pSaveTeamResult[Team]->m_SavedTeam.load(Team);
char aSaveID[UUID_MAXSTRSIZE];
FormatUuid(m_pSaveTeamResult[Team]->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
@ -748,10 +740,7 @@ void CGameTeams::OnCharacterSpawn(int 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
// 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.
SetForceCharacterNewTeam(ClientID, 0);
SetForceCharacterTeam(ClientID, 0);
CheckTeamFinished(Team);
}
}
@ -794,7 +783,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
if (Weapon == WEAPON_SELF)
GameServer()->m_apPlayers[i]->Respawn(true); // spawn the rest of team with weak hook on the killer
}
if(m_MembersCount[Team] > 1)
if(Count(Team) > 1)
GameServer()->SendChatTarget(i, aBuf);
}
}

1
src/game/server/teams.h
View file

@ -12,7 +12,6 @@ class CSqlSaveResult;
class CGameTeams
{
int m_TeamState[MAX_CLIENTS];
int m_MembersCount[MAX_CLIENTS];
bool m_TeeFinished[MAX_CLIENTS];
bool m_TeamLocked[MAX_CLIENTS];
uint64_t m_Invited[MAX_CLIENTS];

8
src/game/teamscore.cpp
View file

@ -6,12 +6,12 @@ CTeamsCore::CTeamsCore()
Reset();
}
bool CTeamsCore::SameTeam(int ClientID1, int ClientID2)
bool CTeamsCore::SameTeam(int ClientID1, int ClientID2) const
{
return m_Team[ClientID1] == m_Team[ClientID2];
}
int CTeamsCore::Team(int ClientID)
int CTeamsCore::Team(int ClientID) const
{
return m_Team[ClientID];
}
@ -21,7 +21,7 @@ void CTeamsCore::Team(int ClientID, int Team)
m_Team[ClientID] = Team;
}
bool CTeamsCore::CanKeepHook(int ClientID1, int ClientID2)
bool CTeamsCore::CanKeepHook(int ClientID1, int ClientID2) const
{
if (m_Team[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_Team[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER)
|| ClientID1 == ClientID2)
@ -29,7 +29,7 @@ bool CTeamsCore::CanKeepHook(int ClientID1, int ClientID2)
return m_Team[ClientID1] == m_Team[ClientID2];
}
bool CTeamsCore::CanCollide(int ClientID1, int ClientID2)
bool CTeamsCore::CanCollide(int ClientID1, int ClientID2) const
{
if (m_Team[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_Team[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER)
|| ClientID1 == ClientID2)

12
src/game/teamscore.h
View file

@ -16,14 +16,14 @@ class CTeamsCore
public:
bool m_IsDDRace16;
CTeamsCore(void);
CTeamsCore();
bool SameTeam(int ClientID1, int ClientID2);
bool SameTeam(int ClientID1, int ClientID2) const;
bool CanKeepHook(int ClientID1, int ClientID2);
bool CanCollide(int ClientID1, int ClientID2);
bool CanKeepHook(int ClientID1, int ClientID2) const;
bool CanCollide(int ClientID1, int ClientID2) const;
int Team(int ClientID);
int Team(int ClientID) const;
void Team(int ClientID, int Team);
void Reset();
@ -32,7 +32,7 @@ public:
m_IsSolo[ClientID] = Value;
}
bool GetSolo(int ClientID)
bool GetSolo(int ClientID) const
{
return m_IsSolo[ClientID];
}