eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Prevent the setmaster console command from forgetting non-legacy masters...

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6137 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-12-20 10:06:32 +00:00
parent 1f01465cf3
commit 4f2994ab12
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
engine/client/net_master.c
View file

@ -610,6 +610,8 @@ static void SV_Master_Add(int type, char *stringadr)
{ {
if (net_masterlist[i].protocol != type) if (net_masterlist[i].protocol != type)
continue; continue;
if (net_masterlist[i].cv.flags & CVAR_NOSAVE)
continue; //ignore our extras
if (!*net_masterlist[i].cv.string) if (!*net_masterlist[i].cv.string)
break; break;
} }
@ -625,6 +627,19 @@ static void SV_Master_Add(int type, char *stringadr)
svs.last_heartbeat = -99999; svs.last_heartbeat = -99999;
} }
static void SV_Master_ClearType(int type)
{
int i;
for (i = 0; net_masterlist[i].cv.name; i++)
{
if (net_masterlist[i].protocol == type)
{
if (net_masterlist[i].cv.flags & CVAR_NOSAVE)
continue; //ignore our extras
Cvar_Set(&net_masterlist[i].cv, "");
}
}
}
static void SV_Master_ClearAll(void) static void SV_Master_ClearAll(void)
{ {
int i; int i;
@ -646,17 +661,22 @@ static void SV_SetMaster_f (void)
{ {
int i; int i;
SV_Master_ClearAll();
if (!strcmp(Cmd_Argv(1), "none")) if (!strcmp(Cmd_Argv(1), "none"))
{ {
Cvar_Set(&sv_public, "0"); //go private.
SV_Master_ClearAll();
if (cl_warncmd.ival) if (cl_warncmd.ival)
Con_Printf ("Entering no-master mode\n"); Con_Printf ("Entering no-master mode\n");
return; return;
} }
if (!strcmp(Cmd_Argv(1), "clear")) if (!strcmp(Cmd_Argv(1), "clear"))
{
SV_Master_ClearType(MP_QUAKEWORLD);
return; return;
}
Cvar_Set(&sv_public, "1"); //go public.
if (!strcmp(Cmd_Argv(1), "default")) if (!strcmp(Cmd_Argv(1), "default"))
{ {
for (i = 0; net_masterlist[i].cv.name; i++) for (i = 0; net_masterlist[i].cv.name; i++)
@ -664,8 +684,7 @@ static void SV_SetMaster_f (void)
return; return;
} }
Cvar_Set(&sv_public, "1"); //go public. SV_Master_ClearType(MP_QUAKEWORLD);
for (i=1 ; i<Cmd_Argc() ; i++) for (i=1 ; i<Cmd_Argc() ; i++)
{ {
SV_Master_Add(MP_QUAKEWORLD, Cmd_Argv(i)); SV_Master_Add(MP_QUAKEWORLD, Cmd_Argv(i));