thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SL_InsertServer: If we have cause to reject a server, remove it from the serverlistultimatecount immediately rather than waiting for it to time out

Browse source
This commit is contained in:
toaster 2023-08-28 00:02:54 +01:00
parent b009ab3c23
commit acca45d611
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/d_clisrv.c
View file

@ -1580,7 +1580,7 @@ static UINT32 SL_SearchServer(INT32 node)
return UINT32_MAX; return UINT32_MAX;
} }
static void SL_InsertServer(serverinfo_pak* info, SINT8 node) static boolean SL_InsertServer(serverinfo_pak* info, SINT8 node)
{ {
UINT32 i; UINT32 i;
@ -1592,25 +1592,25 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
{ {
// not found add it // not found add it
if (serverlistcount >= MAXSERVERLIST) if (serverlistcount >= MAXSERVERLIST)
return; // list full return false; // list full
if (info->_255 != 255) if (info->_255 != 255)
return;/* old packet format */ return false;/* old packet format */
if (info->packetversion != PACKETVERSION) if (info->packetversion != PACKETVERSION)
return;/* old new packet format */ return false;/* old new packet format */
if (info->version != VERSION) if (info->version != VERSION)
return; // Not same version. return false; // Not same version.
if (info->subversion != SUBVERSION) if (info->subversion != SUBVERSION)
return; // Close, but no cigar. return false; // Close, but no cigar.
if (strcmp(info->application, SRB2APPLICATION)) if (strcmp(info->application, SRB2APPLICATION))
return;/* that's a different mod */ return false;/* that's a different mod */
if (info->modifiedgame != (mpmenu.room == 1)) if (info->modifiedgame != (mpmenu.room == 1))
return;/* CORE vs MODDED! */ return false;/* CORE vs MODDED! */
i = serverlistcount++; i = serverlistcount++;
} }
@ -1620,6 +1620,8 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
// resort server list // resort server list
M_SortServerList(); M_SortServerList();
return true;
} }
void CL_QueryServerList (msg_server_t *server_list) void CL_QueryServerList (msg_server_t *server_list)
@ -4646,7 +4648,9 @@ static void HandleServerInfo(SINT8 node)
memcpy(servername, netbuffer->u.serverinfo.servername, MAXSERVERNAME); memcpy(servername, netbuffer->u.serverinfo.servername, MAXSERVERNAME);
CopyCaretColors(netbuffer->u.serverinfo.servername, servername, MAXSERVERNAME); CopyCaretColors(netbuffer->u.serverinfo.servername, servername, MAXSERVERNAME);
SL_InsertServer(&netbuffer->u.serverinfo, node); // If we have cause to reject it, it's not worth observing.
if (SL_InsertServer(&netbuffer->u.serverinfo, node) == false)
serverlistultimatecount--;
} }
static void PT_WillResendGamestate(void) static void PT_WillResendGamestate(void)