From fc6428a0f78e375116bf9dfae0fa6ba45054942b Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 14 Nov 2024 06:22:56 +0100 Subject: [PATCH] use memsets here and clear pingdata too --- src/d_clisrv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 4e91786d8..cfb1e3b15 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4158,14 +4158,20 @@ void SV_ResetServer(void) for (i = 0; i < MAXPLAYERS; i++) { LUA_InvalidatePlayer(&players[i]); - playeringame[i] = false; - playernode[i] = UINT8_MAX; sprintf(player_names[i], "Player %d", i + 1); - adminplayers[i] = -1; // Populate the entire adminplayers array with -1. } memset(player_name_changes, 0, sizeof player_name_changes); + memset(playeringame, false, sizeof playeringame); + memset(playernode, UINT8_MAX, sizeof playernode); + + pingmeasurecount = 1; + memset(realpingtable, 0, sizeof realpingtable); + memset(playerpingtable, 0, sizeof playerpingtable); + + ClearAdminPlayers(); + mynode = 0; cl_packetmissed = false; #ifdef SATURNSYNCH @@ -4434,7 +4440,9 @@ static boolean SV_AddWaitingPlayers(void) buf[0] = (UINT8)node; buf[1] = newplayernum; if (playerpernode[node] < 1) + { nodetoplayer[node] = newplayernum; + } else if (playerpernode[node] < 2) { nodetoplayer2[node] = newplayernum;