Merge branch 'disable-rpc-in-dedicated' into 'master'

Disable Discord Rich Presence on dedicated servers

See merge request KartKrew/Kart-Public!229
This commit is contained in:
Sal 2020-09-16 01:43:40 -04:00
commit ccf6584466
2 changed files with 13 additions and 2 deletions

View file

@ -732,7 +732,10 @@ void D_SRB2Loop(void)
#endif
#ifdef HAVE_DISCORDRPC
Discord_RunCallbacks();
if (! dedicated)
{
Discord_RunCallbacks();
}
#endif
}
}
@ -1600,7 +1603,10 @@ void D_SRB2Main(void)
}
#ifdef HAVE_DISCORDRPC
DRPC_Init();
if (! dedicated)
{
DRPC_Init();
}
#endif
}

View file

@ -482,6 +482,11 @@ void DRPC_UpdatePresence(void)
DiscordRichPresence discordPresence;
memset(&discordPresence, 0, sizeof(discordPresence));
if (dedicated)
{
return;
}
if (!cv_discordrp.value)
{
// User doesn't want to show their game information, so update with empty presence.