thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 13:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the most significant, immediately-apparent problems with Dedicated

Browse source 
- Don't load level twice (only became apparent thanks to new console print warnings)
- Get first map of gametype instead of defaulting to Test Run
- Don't apply profile material
This commit is contained in:
toaster 2022-11-06 00:16:16 +00:00
parent ebdb5db502
commit 11209c5d24
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/d_main.c
View file

@ -1205,7 +1205,7 @@ void D_SRB2Main(void)
INT32 numbasemapheaders; INT32 numbasemapheaders;
INT32 pstartmap = 1; INT32 pstartmap = 0;
boolean autostart = false; boolean autostart = false;
/* break the version string into version numbers, for netplay */ /* break the version string into version numbers, for netplay */
@ -1759,11 +1759,14 @@ void D_SRB2Main(void)
// Has to be done before anything else so skin, color, etc in command buffer has an affect. // Has to be done before anything else so skin, color, etc in command buffer has an affect.
// ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action // ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action
PR_ApplyProfile(cv_ttlprofilen.value, 0); if (!dedicated)
for (i = 1; i < cv_splitplayers.value; i++)
{ {
PR_ApplyProfile(cv_lastprofile[i].value, i); PR_ApplyProfile(cv_ttlprofilen.value, 0);
for (i = 1; i < cv_splitplayers.value; i++)
{
PR_ApplyProfile(cv_lastprofile[i].value, i);
}
} }
if (autostart || netgame) if (autostart || netgame)
@ -1845,8 +1848,13 @@ void D_SRB2Main(void)
CV_SetValue(&cv_kartspeed, newskill); CV_SetValue(&cv_kartspeed, newskill);
} }
if (server && !M_CheckParm("+map")) if (server && (dedicated || !M_CheckParm("+map")))
{ {
if (!pstartmap && (pstartmap = G_GetFirstMapOfGametype(gametype)+1) > nummapheaders)
{
I_Error("Can't get first map of gametype\n");
}
if (M_MapLocked(pstartmap)) if (M_MapLocked(pstartmap))
{ {
G_SetUsedCheats(); G_SetUsedCheats();
@ -1868,14 +1876,6 @@ void D_SRB2Main(void)
CON_ToggleOff(); CON_ToggleOff();
if (dedicated && server)
{
levelstarttic = gametic;
G_SetGamestate(GS_LEVEL);
if (!P_LoadLevel(false, false))
I_Quit(); // fail so reset game stuff
}
#ifdef HAVE_DISCORDRPC #ifdef HAVE_DISCORDRPC
if (! dedicated) if (! dedicated)
{ {