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

Merge branch 'core-modded-bleed' into 'master'

Browse source 
Resolve ring-racers#64

Closes ring-racers#64

See merge request kart-krew-dev/ring-racers-internal!2866
This commit is contained in:
Eidolon 2025-09-16 21:26:00 -05:00
commit 82b95432d3
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_clisrv.c
View file

@ -1587,6 +1587,7 @@ static void SendAskInfo(INT32 node)
serverelem_t serverlist[MAXSERVERLIST];
UINT32 serverlistcount = 0;
UINT32 serverlistultimatecount = 0;
boolean serverlistmode = false;
static boolean resendserverlistnode[MAXNETNODES];
static tic_t serverlistepoch;
@ -1657,7 +1658,7 @@ static boolean SL_InsertServer(serverinfo_pak* info, SINT8 node)
if (i == UINT32_MAX)
{
// Still not added to list... check for modifiedgame rejections
if (serverlistultimatecount)
if (serverlistmode)
{
// We're on the server browser page. We can reject based on our room.
if (

1
src/d_clisrv.h
View file

@ -508,6 +508,7 @@ struct serverelem_t
extern serverelem_t serverlist[MAXSERVERLIST];
extern UINT32 serverlistcount, serverlistultimatecount;
extern boolean serverlistmode;
extern INT32 mapchangepending;
// Points inside doomcom

1
src/d_main.cpp
View file

@ -1209,6 +1209,7 @@ void D_ClearState(void)
SV_StopServer();
SV_ResetServer();
serverlistultimatecount = 0;
serverlistmode = false;
for (i = 0; i < MAXPLAYERS; i++)
CL_ClearPlayer(i);

3
src/menus/play-online-server-browser.c
View file

@ -27,6 +27,7 @@ void M_ServerListFillDebug(void);
static boolean M_ServerBrowserQuit(void)
{
serverlistultimatecount = 0;
serverlistmode = false;
return true;
}
@ -240,6 +241,8 @@ void M_ServersMenu(INT32 choice)
// modified game check: no longer handled
// we don't request a restart unless the filelist differs
serverlistmode = true;
CL_UpdateServerList();
mpmenu.ticker = 0;