vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Well actually, lets fix all comparisons of askset to use the same comparison

Browse source 
If we initialize to I_GetTime() - NEWTICRATE*3 it never underflows and everything is good
This commit is contained in:
Ashnal 2020-08-20 00:54:18 -04:00
parent 65968f00d3
commit aa2b25e667
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/d_clisrv.c
View file

@ -2271,7 +2271,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
} }
// Ask the info to the server (askinfo packet) // Ask the info to the server (askinfo packet)
if (*asksent + NEWTICRATE < I_GetTime()) if ((I_GetTime() - NEWTICRATE) >= *asksent)
{ {
SendAskInfo(servernode); SendAskInfo(servernode);
*asksent = I_GetTime(); *asksent = I_GetTime();
@ -2315,7 +2315,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
case CL_ASKFULLFILELIST: case CL_ASKFULLFILELIST:
if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
cl_mode = CL_CHECKFILES; cl_mode = CL_CHECKFILES;
else if (fileneedednum != cl_lastcheckedfilecount || *asksent + NEWTICRATE < I_GetTime()) else if (fileneedednum != cl_lastcheckedfilecount || (I_GetTime() - NEWTICRATE) >= *asksent)
{ {
if (CL_AskFileList(fileneedednum)) if (CL_AskFileList(fileneedednum))
{ {
@ -2388,7 +2388,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
case CL_LOADFILES: case CL_LOADFILES:
if (CL_LoadServerFiles()) if (CL_LoadServerFiles())
{ {
*asksent = I_GetTime() - (NEWTICRATE*5); //This ensure the first join ask is right away *asksent = I_GetTime() - (NEWTICRATE*3); //This ensure the first join ask is right away
firstconnectattempttime = I_GetTime(); firstconnectattempttime = I_GetTime();
cl_mode = CL_ASKJOIN; cl_mode = CL_ASKJOIN;
} }
@ -2557,7 +2557,7 @@ static void CL_ConnectToServer(void)
pnumnodes = 1; pnumnodes = 1;
oldtic = I_GetTime() - 1; oldtic = I_GetTime() - 1;
#ifndef NONET #ifndef NONET
asksent = (tic_t) - TICRATE; asksent = I_GetTime() - NEWTICRATE*3;
i = SL_SearchServer(servernode); i = SL_SearchServer(servernode);