From ccdb73f8611b2261dfd7d4f020cde7327a0ad511 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 30 Sep 2025 19:33:13 +0200 Subject: [PATCH] delet VANILLAJOINNEXTROUND --- src/d_clisrv.c | 8 -------- src/d_clisrv.h | 3 --- src/d_netcmd.c | 5 ++--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 8f657e342..6492b9943 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4132,10 +4132,6 @@ consvar_t cv_allownewplayer = {"allowjoin", "On", CV_SAVE|CV_CALL, CV_OnOff, Joi consvar_t cv_allownewsaturnplayer = {"allowsaturnjoin", "On", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; #endif -#ifdef VANILLAJOINNEXTROUND -consvar_t cv_joinnextround = {"joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done -#endif - static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {MAXPLAYERS, "MAX"}, {0, NULL}}; consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE|CV_CALL, maxplayers_cons_t, Joinable_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -4847,10 +4843,6 @@ static void HandleConnect(SINT8 node) // you get a free second before desynch checks. use it wisely. SV_InitResynchVars(node); -#ifdef VANILLAJOINNEXTROUND - if (cv_joinnextround.value && gameaction == ga_nothing) - G_SetGamestate(GS_WAITINGPLAYERS); -#endif if (!SV_SendServerConfig(node)) { G_SetGamestate(backupstate); diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 8bfead8d7..2de1271fb 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -583,9 +583,6 @@ extern tic_t lowest_lag; extern consvar_t cv_mindelay, cv_gentlemens; extern consvar_t -#ifdef VANILLAJOINNEXTROUND - cv_joinnextround, -#endif cv_netticbuffer, cv_allownewplayer, #ifdef SATURNJOIN cv_allownewsaturnplayer, diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 982c63f07..3432b55ab 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -738,10 +738,9 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_allownewplayer); CV_RegisterVar(&cv_joinrefusemessage); + CV_RegisterVar(&cv_chatlogsize); -#ifdef VANILLAJOINNEXTROUND - CV_RegisterVar(&cv_joinnextround); -#endif + CV_RegisterVar(&cv_showjoinaddress); CV_RegisterVar(&cv_shownodeip); CV_RegisterVar(&cv_blamecfail);