Merge branch 'dont-advertise-offline' into 'master'

Don't advertise offline

See merge request KartKrew/Kart-Public!300
This commit is contained in:
toaster 2022-08-24 15:54:04 +00:00
commit 4473b6852f
3 changed files with 4 additions and 4 deletions

View file

@ -3986,7 +3986,7 @@ void D_QuitNetGame(void)
if (nodeingame[i])
HSendPacket(i, true, 0, 0);
#ifdef MASTERSERVER
if (serverrunning && cv_advertise.value)
if (serverrunning && netgame && cv_advertise.value) // see mserv.c Online()
UnregisterServer();
#endif
}

View file

@ -6356,7 +6356,7 @@ boolean firstDismissedRulesThisBoot = true;
void M_PopupMasterServerRules(void)
{
#ifdef MASTERSERVER
if (cv_advertise.value && (serverrunning || currentMenu == &MP_ServerDef) && firstDismissedRulesThisBoot)
if (cv_advertise.value && ((serverrunning && netgame) || currentMenu == &MP_ServerDef) && firstDismissedRulesThisBoot)
{
char *rules = GetMasterServerRules();

View file

@ -470,7 +470,7 @@ char *GetMasterServerRules(void)
static boolean
Online (void)
{
return ( serverrunning && cv_advertise.value );
return ( serverrunning && netgame && cv_advertise.value );
}
static inline void SendPingToMasterServer(void)
@ -568,7 +568,7 @@ Advertise_OnChange(void)
if (cv_advertise.value)
{
if (serverrunning)
if (serverrunning && netgame)
{
Lock_state();
{