stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dedicatedaddonsfolder' into 'public_next'

Browse source 
Define cv_addons_folder in dedicated

See merge request STJr/SRB2Internal!639
This commit is contained in:
sphere 2023-04-12 17:48:54 +00:00
commit 630c324114
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -794,8 +794,8 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_digitaldeadzone2);
// filesrch.c
CV_RegisterVar(&cv_addons_option);
CV_RegisterVar(&cv_addons_folder);
//CV_RegisterVar(&cv_addons_option); // These two are now defined
//CV_RegisterVar(&cv_addons_folder); // in R_RegisterEngineStuff
CV_RegisterVar(&cv_addons_md5);
CV_RegisterVar(&cv_addons_showall);
CV_RegisterVar(&cv_addons_search_type);

5
src/r_main.c
View file

@ -36,6 +36,7 @@
#include "r_main.h"
#include "i_system.h" // I_GetPreciseTime
#include "r_fps.h" // Frame interpolation/uncapped
#include "filesrch.c" // cv_addons_folder
#ifdef HWRENDER
#include "hardware/hw_main.h"
@ -1589,6 +1590,10 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_flipcam);
CV_RegisterVar(&cv_flipcam2);
// Other filesrch.c consvars are defined in D_RegisterClientCommands
CV_RegisterVar(&cv_addons_option);
CV_RegisterVar(&cv_addons_folder);
// Enough for dedicated server
if (dedicated)
return;