incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' of https://codeberg.org/NepDisk/blankart into next

Browse source
This commit is contained in:
minenice55 2026-04-25 20:52:30 -04:00
commit f99d9f160d
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/command.c
View file

@ -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;
}

2
src/doomdef.h
View file

@ -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

2
src/mserv.c
View file

@ -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);