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

Remove teamkill message on solo teams

Browse source 
For speedrunning alone in a team this "Everyone in your locked team was killed because '%s' %s."
is very annoying. So better only print it if more than 1 tee is in the team.
This commit is contained in:
ChillerDragon 2018-03-06 14:08:04 +01:00
parent eef5131b0d
commit 57cb136c55
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -646,7 +646,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
int Team = m_Core.Team(ClientID);
bool Locked = TeamLocked(Team) && Weapon != WEAPON_GAME;
if (!Locked)
if(!Locked)
{
SetForceCharacterTeam(ClientID, 0);
CheckTeamFinished(Team);
@ -655,14 +655,14 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
{
SetForceCharacterTeam(ClientID, Team);
if (GetTeamState(Team) != TEAMSTATE_OPEN)
if(GetTeamState(Team) != TEAMSTATE_OPEN)
{
ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "Everyone in your locked team was killed because '%s' %s.", Server()->ClientName(ClientID), Weapon == WEAPON_SELF ? "killed" : "died");
for (int i = 0; i < MAX_CLIENTS; i++)
for(int i = 0; i < MAX_CLIENTS; i++)
if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
{
if(i != ClientID)
@ -671,7 +671,8 @@ 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
}
GameServer()->SendChatTarget(i, aBuf);
if(m_MembersCount[Team] > 1)
GameServer()->SendChatTarget(i, aBuf);
}
}
}