From 4141de4414de30a8926537f0e02bc8928c15df3b Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 25 Apr 2026 19:55:11 -0400 Subject: [PATCH] Upgrade masterserver cvar to our selfhosted one --- src/command.c | 7 ++++++- src/doomdef.h | 2 +- src/mserv.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/command.c b/src/command.c index a602fe886..244df5088 100644 --- a/src/command.c +++ b/src/command.c @@ -2420,9 +2420,14 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr) if (!(v->flags & CV_SAVE)) return true; - // nothing to see here... (void)valstr; + if (GETMAJOREXECVERSION(cv_execversion.value) == 12 && GETMINOREXECVERSION(cv_execversion.value) < 1) // 12.1 = BK Indev 25-04-26 + { + if (fasticmp(v->name, "masterserver")) // Upgrade the masterserver from SRB2Classic's to our own. + return false; + } + return true; } diff --git a/src/doomdef.h b/src/doomdef.h index 8a8734e67..70e783b97 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -141,7 +141,7 @@ extern char logfilename[1024]; // to an increment in MODVERSION. This might never happen in practice. // If MODVERSION increases, set MINOREXECVERSION to 0. #define MAJOREXECVERSION MODVERSION -#define MINOREXECVERSION 0 +#define MINOREXECVERSION 1 // (It would have been nice to use VERSION and SUBVERSION but those are zero'd out for DEVELOP builds) // Macros diff --git a/src/mserv.c b/src/mserv.c index 0b95ff2cf..365be3430 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -68,7 +68,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = { }; //https://ms.kartkrew.org/ms/api -consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ms.srb2classic.net/MS/1", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange); +consvar_t cv_masterserver = CVAR_INIT ("masterserver", "http://172.239.198.27/MS/1", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange); consvar_t cv_rendezvousserver = CVAR_INIT ("holepunchserver", "relay.kartkrew.org", CV_SAVE, NULL, NULL); consvar_t cv_servername = CVAR_INIT ("servername", "SRB2Kart server", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters); consvar_t cv_server_contact = CVAR_INIT ("server_contact", "", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters);