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

Hopefully fix a bunch of locked team bugs

Browse source
This commit is contained in:
def 2014-02-08 14:33:42 +01:00
parent 79a99a994c
commit 7804f9314d
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/game/server/player.cpp
View file

@ -377,22 +377,6 @@ void CPlayer::KillCharacter(int Weapon)
m_pCharacter->Die(m_ClientID, Weapon);
int Team = m_pCharacter->Teams()->m_Core.Team(m_ClientID);
m_pCharacter->Teams()->SetForceCharacterTeam(m_ClientID, Team);
if (m_pCharacter->Teams()->TeamLocked(Team) && m_pCharacter->Teams()->GetTeamState(Team) != CGameTeams::TEAMSTATE_OPEN)
{
for (int i = 0; i < MAX_CLIENTS; i++)
{
if(m_pCharacter->Teams()->m_Core.Team(i) == Team && i != m_ClientID)
{
m_pGameServer->m_apPlayers[i]->KillCharacter();
}
}
}
m_pCharacter->Teams()->ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
delete m_pCharacter;
m_pCharacter = 0;
}
@ -421,8 +405,7 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
if(Team == TEAM_SPECTATORS)
{
CGameControllerDDRace* Controller = (CGameControllerDDRace*)GameServer()->m_pController;
Controller->m_Teams.ForceLeaveTeam(m_ClientID);
Controller->m_Teams.m_Core.Team(m_ClientID, 0);
Controller->m_Teams.SetForceCharacterTeam(m_ClientID, 0);
}
KillCharacter();

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

@ -571,6 +571,18 @@ void CGameTeams::OnCharacterDeath(int ClientID)
if (!m_TeamLocked[m_Core.Team(ClientID)])
SetForceCharacterTeam(ClientID, 0);
else
{
int Team = m_Core.Team(ClientID);
SetForceCharacterTeam(ClientID, Team);
if (TeamLocked(Team) && GetTeamState(Team) != TEAMSTATE_OPEN)
for (int i = 0; i < MAX_CLIENTS; i++)
if(m_Core.Team(i) == Team && i != ClientID)
GameServer()->m_apPlayers[i]->KillCharacter();
ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
}
}
void CGameTeams::SetTeamLock(int Team, bool Lock)