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

Server startup cleanup

Browse source 
* Don't do a shoddy attempt at guessing initial gametype in G_DeferedInitNew
* Fix map command on main menu regression (no longer HOM void)
This commit is contained in:
toaster 2022-12-26 22:16:14 +00:00
parent eb74ec3904
commit a8a60460fb
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_clisrv.c
View file

@ -2081,8 +2081,9 @@ static void CL_ConnectToServer(void)
Y_EndVote(); Y_EndVote();
DEBFILE(va("waiting %d nodes\n", doomcom->numnodes)); DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
M_ClearMenus(true);
G_SetGamestate(GS_WAITINGPLAYERS); G_SetGamestate(GS_WAITINGPLAYERS);
if (wipegamestate == GS_MENU)
M_ClearMenus(true);
wipegamestate = GS_WAITINGPLAYERS; wipegamestate = GS_WAITINGPLAYERS;
ClearAdminPlayers(); ClearAdminPlayers();

12
src/g_game.c
View file

@ -4816,7 +4816,6 @@ cleanup:
void G_DeferedInitNew(boolean pencoremode, INT32 map, INT32 pickedchar, UINT8 ssplayers, boolean FLS) void G_DeferedInitNew(boolean pencoremode, INT32 map, INT32 pickedchar, UINT8 ssplayers, boolean FLS)
{ {
UINT16 color = SKINCOLOR_NONE; UINT16 color = SKINCOLOR_NONE;
INT32 dogametype;
paused = false; paused = false;
@ -4827,17 +4826,8 @@ void G_DeferedInitNew(boolean pencoremode, INT32 map, INT32 pickedchar, UINT8 ss
G_ResetRandMapBuffer(); G_ResetRandMapBuffer();
if ((modeattacking == ATTACKING_CAPSULES) || (bossinfo.boss == true))
{
dogametype = GT_BATTLE;
}
else
{
dogametype = GT_RACE;
}
// this leave the actual game if needed // this leave the actual game if needed
SV_StartSinglePlayerServer(dogametype, false); SV_StartSinglePlayerServer(gametype, false);
if (splitscreen != ssplayers) if (splitscreen != ssplayers)
{ {