From d2228bf34939f8a5dfe6b4e937e04d970194561d Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 6 Nov 2022 13:15:17 +0000 Subject: [PATCH] Move some command and cvar registering between D_RegisterServerCommands and D_RegisterClientCommands depending on whether a dedicated server needs them or not --- src/d_netcmd.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5b7ade755..d30415466 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -821,8 +821,6 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_pingmeasurement); CV_RegisterVar(&cv_showviewpointtext); - CV_RegisterVar(&cv_director); - CV_RegisterVar(&cv_schedule); CV_RegisterVar(&cv_automate); @@ -834,6 +832,23 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_discordinvites); RegisterNetXCmd(XD_DISCORD, Got_DiscordInfo); + + COM_AddCommand("numthinkers", Command_Numthinkers_f); + COM_AddCommand("countmobjs", Command_CountMobjs_f); + + CV_RegisterVar(&cv_recordmultiplayerdemos); + CV_RegisterVar(&cv_netdemosyncquality); + + CV_RegisterVar(&cv_shoutname); + CV_RegisterVar(&cv_shoutcolor); + CV_RegisterVar(&cv_autoshout); + +#ifdef _DEBUG + COM_AddCommand("causecfail", Command_CauseCfail_f); +#endif +#ifdef LUA_ALLOW_BYTECODE + COM_AddCommand("dumplua", Command_Dumplua_f); +#endif } // ========================================================================= @@ -881,9 +896,6 @@ void D_RegisterClientCommands(void) if (dedicated) return; - COM_AddCommand("numthinkers", Command_Numthinkers_f); - COM_AddCommand("countmobjs", Command_CountMobjs_f); - COM_AddCommand("changeteam", Command_Teamchange_f); COM_AddCommand("changeteam2", Command_Teamchange2_f); COM_AddCommand("changeteam3", Command_Teamchange3_f); @@ -978,9 +990,6 @@ void D_RegisterClientCommands(void) COM_AddCommand("displayplayer", Command_Displayplayer_f); - CV_RegisterVar(&cv_recordmultiplayerdemos); - CV_RegisterVar(&cv_netdemosyncquality); - // FIXME: not to be here.. but needs be done for config loading CV_RegisterVar(&cv_globalgamma); CV_RegisterVar(&cv_globalsaturation); @@ -1016,10 +1025,6 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_chatnotifications); CV_RegisterVar(&cv_chatbacktint); - CV_RegisterVar(&cv_shoutname); - CV_RegisterVar(&cv_shoutcolor); - CV_RegisterVar(&cv_autoshout); - CV_RegisterVar(&cv_songcredits); CV_RegisterVar(&cv_tutorialprompt); CV_RegisterVar(&cv_showfocuslost); @@ -1077,7 +1082,6 @@ void D_RegisterClientCommands(void) // screen.c CV_RegisterVar(&cv_fullscreen); CV_RegisterVar(&cv_renderview); - CV_RegisterVar(&cv_renderhitbox); CV_RegisterVar(&cv_vhseffect); CV_RegisterVar(&cv_shittyscreen); CV_RegisterVar(&cv_renderer); @@ -1085,6 +1089,8 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_scr_width); CV_RegisterVar(&cv_scr_height); + CV_RegisterVar(&cv_director); + CV_RegisterVar(&cv_soundtest); CV_RegisterVar(&cv_invincmusicfade); @@ -1105,7 +1111,7 @@ void D_RegisterClientCommands(void) // CV_RegisterVar(&cv_grid); // CV_RegisterVar(&cv_snapto); - // add cheat commands + // add cheats COM_AddCommand("noclip", Command_CheatNoClip_f); COM_AddCommand("god", Command_CheatGod_f); COM_AddCommand("setrings", Command_Setrings_f); @@ -1119,12 +1125,7 @@ void D_RegisterClientCommands(void) COM_AddCommand("rteleport", Command_RTeleport_f); COM_AddCommand("skynum", Command_Skynum_f); COM_AddCommand("weather", Command_Weather_f); -#ifdef _DEBUG - COM_AddCommand("causecfail", Command_CauseCfail_f); -#endif -#ifdef LUA_ALLOW_BYTECODE - COM_AddCommand("dumplua", Command_Dumplua_f); -#endif + CV_RegisterVar(&cv_renderhitbox); #ifdef HAVE_DISCORDRPC CV_RegisterVar(&cv_discordrp);