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

Merge pull request #7519 from Robyt3/Server-Debug-Dummies-Dynamic

Browse source 
Dynamically connect/disconnect debug dummies, cleanup
This commit is contained in:
Dennis Felsing 2023-11-21 22:41:46 +00:00 committed by GitHub
parent 35f071b021 0d8a0d3b1d
commit 7c0c7051b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/engine/server/server.cpp
View file

@ -2615,6 +2615,44 @@ int CServer::LoadMap(const char *pMapName)
return 1;
}
#ifdef CONF_DEBUG
void CServer::UpdateDebugDummies(bool ForceDisconnect)
{
if(m_PreviousDebugDummies == g_Config.m_DbgDummies && !ForceDisconnect)
return;
for(int DummyIndex = 0; DummyIndex < maximum(m_PreviousDebugDummies, g_Config.m_DbgDummies); ++DummyIndex)
{
const bool AddDummy = !ForceDisconnect && DummyIndex < g_Config.m_DbgDummies;
const int ClientID = MAX_CLIENTS - DummyIndex - 1;
if(AddDummy && m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
{
NewClientCallback(ClientID, this, false);
GameServer()->OnClientConnected(ClientID, nullptr);
m_aClients[ClientID].m_State = CClient::STATE_INGAME;
str_format(m_aClients[ClientID].m_aName, sizeof(m_aClients[ClientID].m_aName), "Debug dummy %d", DummyIndex + 1);
GameServer()->OnClientEnter(ClientID);
}
else if(!AddDummy && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
{
DelClientCallback(ClientID, "Dropping debug dummy", this);
}
if(AddDummy && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
{
CNetObj_PlayerInput Input = {0};
Input.m_Direction = (ClientID & 1) ? -1 : 1;
m_aClients[ClientID].m_aInputs[0].m_GameTick = Tick() + 1;
mem_copy(m_aClients[ClientID].m_aInputs[0].m_aData, &Input, minimum(sizeof(Input), sizeof(m_aClients[ClientID].m_aInputs[0].m_aData)));
m_aClients[ClientID].m_LatestInput = m_aClients[ClientID].m_aInputs[0];
m_aClients[ClientID].m_CurrentInput = 0;
}
}
m_PreviousDebugDummies = ForceDisconnect ? 0 : g_Config.m_DbgDummies;
}
#endif
int CServer::Run()
{
if(m_RunServer == UNINITIALIZED)
@ -2762,6 +2800,9 @@ int CServer::Run()
}
}
#ifdef CONF_DEBUG
UpdateDebugDummies(true);
#endif
GameServer()->OnShutdown(m_pPersistentData);
for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
@ -2851,6 +2892,10 @@ int CServer::Run()
{
GameServer()->OnPreTickTeehistorian();
#ifdef CONF_DEBUG
UpdateDebugDummies(false);
#endif
for(int c = 0; c < MAX_CLIENTS; c++)
{
if(m_aClients[c].m_State != CClient::STATE_INGAME)

5
src/engine/server/server.h
View file

@ -122,6 +122,11 @@ class CServer : public IServer
class CDbConnectionPool *m_pConnectionPool;
#ifdef CONF_DEBUG
int m_PreviousDebugDummies = 0;
void UpdateDebugDummies(bool ForceDisconnect);
#endif
public:
class IGameServer *GameServer() { return m_pGameServer; }
class CConfig *Config() { return m_pConfig; }

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

@ -1195,21 +1195,6 @@ void CGameContext::OnTick()
m_SqlRandomMapResult = nullptr;
}
#ifdef CONF_DEBUG
if(g_Config.m_DbgDummies)
{
for(int i = 0; i < g_Config.m_DbgDummies; i++)
{
if(m_apPlayers[MAX_CLIENTS - i - 1])
{
CNetObj_PlayerInput Input = {0};
Input.m_Direction = (i & 1) ? -1 : 1;
m_apPlayers[MAX_CLIENTS - i - 1]->OnPredictedInput(&Input);
}
}
}
#endif
// Record player position at the end of the tick
if(m_TeeHistorianActive)
{
@ -1615,14 +1600,6 @@ void CGameContext::OnClientConnected(int ClientID, void *pData)
m_apPlayers[ClientID]->SetInitialAfk(Afk);
NextUniqueClientID += 1;
#ifdef CONF_DEBUG
if(g_Config.m_DbgDummies)
{
if(ClientID >= MAX_CLIENTS - g_Config.m_DbgDummies)
return;
}
#endif
SendMotd(ClientID);
SendSettings(ClientID);
@ -3702,16 +3679,6 @@ void CGameContext::OnInit(const void *pPersistentData)
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "git-revision", GIT_SHORTREV_HASH);
m_pAntibot->RoundStart(this);
#ifdef CONF_DEBUG
if(g_Config.m_DbgDummies)
{
for(int i = 0; i < g_Config.m_DbgDummies; i++)
{
OnClientConnected(MAX_CLIENTS - i - 1, 0);
}
}
#endif
}
void CGameContext::CreateAllEntities(bool Initial)

7
src/game/server/gamecontroller.cpp
View file

@ -53,13 +53,6 @@ void IGameController::DoActivityCheck()
for(int i = 0; i < MAX_CLIENTS; ++i)
{
#ifdef CONF_DEBUG
if(g_Config.m_DbgDummies)
{
if(i >= MAX_CLIENTS - g_Config.m_DbgDummies)
break;
}
#endif
if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && Server()->GetAuthedState(i) == AUTHED_NO)
{
if(Server()->Tick() > GameServer()->m_apPlayers[i]->m_LastActionTick + g_Config.m_SvInactiveKickTime * Server()->TickSpeed() * 60)

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

@ -169,14 +169,7 @@ void CPlayer::Tick()
m_ScoreFinishResult = nullptr;
}
bool ClientIngame = Server()->ClientIngame(m_ClientID);
#ifdef CONF_DEBUG
if(g_Config.m_DbgDummies && m_ClientID >= MAX_CLIENTS - g_Config.m_DbgDummies)
{
ClientIngame = true;
}
#endif
if(!ClientIngame)
if(!Server()->ClientIngame(m_ClientID))
return;
if(m_ChatScore > 0)
@ -302,11 +295,8 @@ void CPlayer::PostTick()
void CPlayer::PostPostTick()
{
#ifdef CONF_DEBUG
if(!g_Config.m_DbgDummies || m_ClientID < MAX_CLIENTS - g_Config.m_DbgDummies)
#endif
if(!Server()->ClientIngame(m_ClientID))
return;
if(!Server()->ClientIngame(m_ClientID))
return;
if(!GameServer()->m_World.m_Paused && !m_pCharacter && m_Spawning && m_WeakHookSpawn)
TryRespawn();
@ -314,11 +304,8 @@ void CPlayer::PostPostTick()
void CPlayer::Snap(int SnappingClient)
{
#ifdef CONF_DEBUG
if(!g_Config.m_DbgDummies || m_ClientID < MAX_CLIENTS - g_Config.m_DbgDummies)
#endif
if(!Server()->ClientIngame(m_ClientID))
return;
if(!Server()->ClientIngame(m_ClientID))
return;
int id = m_ClientID;
if(!Server()->Translate(id, SnappingClient))

4
src/game/variables.h
View file

@ -221,8 +221,8 @@ MACRO_CONFIG_INT(ClVideoX264Crf, cl_video_crf, 18, 0, 51, CFGFLAG_CLIENT | CFGFL
MACRO_CONFIG_INT(ClVideoX264Preset, cl_video_preset, 5, 0, 9, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Set preset when encode video with libx264, default is 5 (medium), 0 is ultrafast, 9 is placebo (the slowest, not recommend)")
// debug
#ifdef CONF_DEBUG // this one can crash the server if not used correctly
MACRO_CONFIG_INT(DbgDummies, dbg_dummies, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "(Debug build only)")
#ifdef CONF_DEBUG
MACRO_CONFIG_INT(DbgDummies, dbg_dummies, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Add debug dummies to server (Debug build only)")
#endif
MACRO_CONFIG_INT(DbgTuning, dbg_tuning, 0, 0, 2, CFGFLAG_CLIENT, "Display information about the tuning parameters that affect the own player (0 = off, 1 = show changed, 2 = show all)")