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

Merge pull request #7648 from dobrykafe/pr-master-info

Browse source 
report the ddrace team to master instead of the normal team
This commit is contained in:
heinrich5991 2023-12-20 15:27:32 +00:00 committed by GitHub
parent 2b344f4a01 40d56611ba
commit ddd10f2308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/server/gamecontext.cpp
View file

@ -4711,6 +4711,7 @@ void CGameContext::OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID)
}
}
const int Team = m_pController->IsTeamPlay() ? m_apPlayers[ID]->GetTeam() : m_apPlayers[ID]->GetTeam() == TEAM_SPECTATORS ? -1 : GetDDRaceTeam(ID);
str_format(aBuf, BufSize,
",\"skin\":{"
"%s"
@ -4719,5 +4720,5 @@ void CGameContext::OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID)
"\"team\":%d",
aJsonSkin,
JsonBool(m_apPlayers[ID]->IsAfk()),
m_apPlayers[ID]->GetTeam());
Team);
}

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

@ -151,6 +151,7 @@ public:
CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1);
virtual void InitTeleporter();
bool IsTeamPlay() { return m_GameFlags & GAMEFLAG_TEAMS; }
// DDRace
float m_CurrentRecord;

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

@ -626,6 +626,11 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
pPlayer->m_SpectatorID = SPEC_FREEVIEW;
}
}
if(!GameServer()->m_pController->IsTeamPlay())
{
Server()->ExpireServerInfo();
}
}
bool CPlayer::SetTimerType(int TimerType)