stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-25 03:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'update-quittime-while-idling' into 'next'

Browse source 
Update player->quittime while a Server is Idling, Attempt 2

Closes #1143 and #1119

See merge request STJr/SRB2!2254
This commit is contained in:
Logan Aerl Arias 2024-01-02 18:32:31 +00:00
commit a72e80a528
4 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/netcode/d_clisrv.c
View file

@ -1280,6 +1280,7 @@ static void UpdatePingTable(void)
} }
} }
// Handle idle and disconnected player timers
static void IdleUpdate(void) static void IdleUpdate(void)
{ {
INT32 i; INT32 i;
@ -1302,7 +1303,26 @@ static void IdleUpdate(void)
} }
} }
else else
{
players[i].lastinputtime = 0; players[i].lastinputtime = 0;
if (players[i].quittime && playeringame[i])
{
players[i].quittime++;
if (players[i].quittime == 30 * TICRATE && G_TagGametype())
P_CheckSurvivors();
if (server && players[i].quittime >= (tic_t)FixedMul(cv_rejointimeout.value, 60 * TICRATE)
&& !(players[i].quittime % TICRATE))
{
if (D_NumNodes(true) > 0)
SendKick(i, KICK_MSG_PLAYER_QUIT);
else // If the server is empty, don't send a NetXCmd - that would wake an idling dedicated server
CL_RemovePlayer(i, KICK_MSG_PLAYER_QUIT);
}
}
}
} }
} }
@ -1623,12 +1643,15 @@ INT32 D_NumPlayers(void)
return num; return num;
} }
/** Returns the number of nodes on the server. /** Returns the number of currently-connected nodes in a netgame.
* Not necessarily equivalent to D_NumPlayers() minus D_NumBots().
*
* \param skiphost Skip the server's own node.
*/ */
INT32 D_NumNodes(void) INT32 D_NumNodes(boolean skiphost)
{ {
INT32 num = 0; INT32 num = 0;
for (INT32 ix = 0; ix < MAXNETNODES; ix++) for (INT32 ix = skiphost ? 1 : 0; ix < MAXNETNODES; ix++)
if (netnodes[ix].ingame) if (netnodes[ix].ingame)
num++; num++;
return num; return num;

2
src/netcode/d_clisrv.h
View file

@ -121,7 +121,7 @@ extern char motd[254], server_context[8];
extern UINT8 playernode[MAXPLAYERS]; extern UINT8 playernode[MAXPLAYERS];
INT32 D_NumPlayers(void); INT32 D_NumPlayers(void);
INT32 D_NumNodes(void); INT32 D_NumNodes(boolean skiphost);
INT32 D_NumBots(void); INT32 D_NumBots(void);
tic_t GetLag(INT32 node); tic_t GetLag(INT32 node);

2
src/netcode/server_connection.c
View file

@ -109,7 +109,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime); netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
// Exclude bots from both counts // Exclude bots from both counts
netbuffer->u.serverinfo.numberofplayer = (UINT8)(D_NumNodes() - (dedicated ? 1 : 0)); netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumNodes(dedicated);
netbuffer->u.serverinfo.maxplayer = (UINT8)(cv_maxplayers.value - D_NumBots()); netbuffer->u.serverinfo.maxplayer = (UINT8)(cv_maxplayers.value - D_NumBots());
netbuffer->u.serverinfo.refusereason = GetRefuseReason(node); netbuffer->u.serverinfo.refusereason = GetRefuseReason(node);

16
src/p_tick.c
View file

@ -701,25 +701,11 @@ void P_Ticker(boolean run)
{ {
INT32 i; INT32 i;
// Increment jointime and quittime even if paused // Increment jointime even if paused
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i]) if (playeringame[i])
{
players[i].jointime++; players[i].jointime++;
if (players[i].quittime)
{
players[i].quittime++;
if (players[i].quittime == 30 * TICRATE && G_TagGametype())
P_CheckSurvivors();
if (server && players[i].quittime >= (tic_t)FixedMul(cv_rejointimeout.value, 60 * TICRATE)
&& !(players[i].quittime % TICRATE))
SendKick(i, KICK_MSG_PLAYER_QUIT);
}
}
if (objectplacing) if (objectplacing)
{ {
if (OP_FreezeObjectplace()) if (OP_FreezeObjectplace())