From 6ca451da45e7ffc1b50057ad0f05fc3432eebff7 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 30 Aug 2020 23:26:00 -0400 Subject: [PATCH] Wrong file --- src/d_clisrv.c | 4 ++++ src/d_clisrv.h | 2 ++ src/d_netcmd.c | 4 ---- src/d_netcmd.h | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index dcd85156..704460d8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3564,6 +3564,10 @@ consvar_t cv_joinnextround = {"joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOf 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}; +// Here for dedicated servers +static CV_PossibleValue_t discordinvites_cons_t[] = {{0, "Admins Only"}, {1, "Everyone"}, {0, NULL}}; +consvar_t cv_discordinvites = {"discordinvites", "Everyone", CV_SAVE|CV_CALL, discordinvites_cons_t, Joinable_Onchange, 0, NULL, NULL, 0, 0, NULL}; + static CV_PossibleValue_t resynchattempts_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}}; consvar_t cv_resynchattempts = {"resynchattempts", "5", CV_SAVE, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL }; consvar_t cv_blamecfail = {"blamecfail", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL }; diff --git a/src/d_clisrv.h b/src/d_clisrv.h index ef988ac8..d750fb6c 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -559,6 +559,8 @@ extern consvar_t #endif cv_netticbuffer, cv_allownewplayer, cv_maxplayers, cv_resynchattempts, cv_blamecfail, cv_maxsend, cv_noticedownload, cv_downloadspeed; +extern consvar_t cv_discordinvites; + // Used in d_net, the only dependence tic_t ExpandTics(INT32 low, tic_t basetic); void D_ClientServerInit(void); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 8959486e..ea265e43 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -467,10 +467,6 @@ consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange, consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL}; -// Here for dedicated servers -static CV_PossibleValue_t discordinvites_cons_t[] = {{0, "Admins Only"}, {1, "Everyone"}, {0, NULL}}; -consvar_t cv_discordinvites = {"discordinvites", "Everyone", CV_SAVE|CV_CALL, discordinvites_cons_t, DRPC_SendDiscordInfo, 0, NULL, NULL, 0, 0, NULL}; - INT16 gametype = GT_RACE; // SRB2kart boolean forceresetplayers = false; boolean deferencoremode = false; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 2c0ed142..1e158808 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -151,8 +151,6 @@ extern consvar_t cv_skipmapcheck; extern consvar_t cv_sleep; -extern consvar_t cv_discordinvites; - typedef enum { XD_NAMEANDCOLOR = 1,