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

Revert "Update teams.cpp"

Browse source 
This reverts commit fa59910ef2.
This commit is contained in:
def 2014-10-21 14:22:47 +02:00
parent 9baf62a3f0
commit 7b259b3022
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -628,10 +628,10 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
str_format(aBuf, sizeof(aBuf), "'%s' joined team 0.", Server()->ClientName(ClientID)); str_format(aBuf, sizeof(aBuf), "'%s' joined team 0.", Server()->ClientName(ClientID));
for (int i = 0; i < MAX_CLIENTS; i++) for (int i = 0; i < MAX_CLIENTS; i++)
{ {
if(m_Core.Team(i) == Team && i!= ClientID &&GameServer()->m_apPlayers[i]) if(m_Core.Team(i) == Team && i!= ClientID &&GameServer()->m_apPlayers[i])
{ {
GameServer()->SendChatTarget(i, aBuf); GameServer()->SendChatTarget(i, aBuf);
} }
} }
} }
else else
@ -658,10 +658,9 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i]) if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
{ {
if(i!= ClientID) if(i!= ClientID)
{
GameServer()->m_apPlayers[i]->KillCharacter(-2); GameServer()->m_apPlayers[i]->KillCharacter(-2);
GameServer()->SendChatTarget(i, aBuf);
} GameServer()->SendChatTarget(i, aBuf);
} }
} }