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 'fix-file' into 'master'

Browse source 
Fix random desyncs with `-file` in addons with custom net cvars.

Closes #47

See merge request KartKrew/RingRacers!29
This commit is contained in:
Sal 2024-08-28 22:09:08 +00:00
commit 874256a19e
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/console.c
View file

@ -1917,9 +1917,9 @@ static const char *CON_LoadingStrings[LOADED_ALLDONE+1] =
"Init zone memory...", //LOADED_ZINIT
"Init game timing...", //LOADED_ISTARTUPTIMER
"Loading main assets...", //LOADED_IWAD
"Loading add-ons...", //LOADED_PWAD
"Init graphics subsystem...", //LOADED_ISTARTUPGRAPHICS
"Cache fonts...", //LOADED_HUINIT
"Loading add-ons...", //LOADED_PWAD
"Load settings...", //LOADED_CONFIG
"Cache textures...", //LOADED_INITTEXTUREDATA
"Cache sprites...", //LOADED_INITSPIRTES

2
src/console.h
View file

@ -42,9 +42,9 @@ typedef enum
LOADED_ZINIT = 1,
LOADED_ISTARTUPTIMER,
LOADED_IWAD,
LOADED_PWAD,
LOADED_ISTARTUPGRAPHICS,
LOADED_HUINIT,
LOADED_PWAD,
LOADED_CONFIG,
LOADED_INITTEXTUREDATA,
LOADED_INITSPRITES,

36
src/d_main.cpp
View file

@ -1755,17 +1755,6 @@ void D_SRB2Main(void)
CON_SetLoadingProgress(LOADED_IWAD);
CONS_Printf("W_InitMultipleFiles(): Adding external PWADs.\n");
W_InitMultipleFiles(startuppwads, true);
D_CleanFile(startuppwads);
//
// search for pwad maps
//
P_InitMapData();
CON_SetLoadingProgress(LOADED_PWAD);
M_PasswordInit();
//---------------------------------------------------- READY SCREEN
@ -1798,14 +1787,35 @@ void D_SRB2Main(void)
CON_Init();
CON_SetLoadingProgress(LOADED_HUINIT);
D_RegisterServerCommands();
D_RegisterClientCommands(); // be sure that this is called before D_CheckNetGame
R_RegisterEngineStuff();
S_RegisterSoundStuff();
I_RegisterSysCommands();
CON_SetLoadingProgress(LOADED_HUINIT);
CONS_Printf("W_InitMultipleFiles(): Adding external PWADs.\n");
// HACK: Refer to https://git.do.srb2.org/KartKrew/RingRacers/-/merge_requests/29#note_61574
partadd_earliestfile = numwadfiles;
W_InitMultipleFiles(startuppwads, true);
// Only search for pwad maps and reload graphics if we actually have a pwad added
if (startuppwads[0] != NULL)
{
//
// search for pwad maps
//
P_InitMapData();
HU_LoadGraphics();
}
D_CleanFile(startuppwads);
partadd_earliestfile = UINT16_MAX;
CON_SetLoadingProgress(LOADED_PWAD);
M_Init();