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

Revert "Don't show solo players with /showothers because it's buggy"

Browse source 
This reverts commit 3cb26984aa.
This commit is contained in:
def 2014-01-22 21:48:13 +01:00
parent 3cb26984aa
commit 6997a801bc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,7 +266,9 @@ int64_t CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
if (!GetPlayer(i))
continue; // Player doesn't exist
if (!(GetPlayer(i)->GetTeam() == -1 || GetPlayer(i)->m_Paused))
if (GetPlayer(i)->m_ShowOthers)
{} // ShowOthers sees all
else if (!(GetPlayer(i)->GetTeam() == -1 || GetPlayer(i)->m_Paused))
{ // Not spectator
if (i != Asker)
{ // Actions of other players
@ -282,9 +284,7 @@ int64_t CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
}
else if (GetPlayer(i)->m_SpectatorID != SPEC_FREEVIEW)
{ // Spectating specific player
if (GetPlayer(i)->m_ShowOthers)
{} // ShowOthers sees all
else if (GetPlayer(i)->m_SpectatorID != Asker)
if (GetPlayer(i)->m_SpectatorID != Asker)
{ // Actions of other players
if (m_Core.Team(GetPlayer(i)->m_SpectatorID) != Team)
continue; // In different teams