Merge branch 'discod-join-minor-improvements' into 'master'

Discord joins now force menu close and title demo stop

See merge request KartKrew/Kart-Public!270
This commit is contained in:
Sal 2022-03-29 22:17:55 +00:00
commit 4d6c57551c

View file

@ -156,6 +156,9 @@ static void DRPC_HandleJoin(const char *secret)
{ {
char *ip = DRPC_XORIPString(secret); char *ip = DRPC_XORIPString(secret);
CONS_Printf("Connecting to %s via Discord\n", ip); CONS_Printf("Connecting to %s via Discord\n", ip);
M_ClearMenus(true); //Don't have menus open during connection screen
if (demo.playback && demo.title)
G_CheckDemoStatus(); //Stop the title demo, so that the connect command doesn't error if a demo is playing
COM_BufAddText(va("connect \"%s\"\n", ip)); COM_BufAddText(va("connect \"%s\"\n", ip));
free(ip); free(ip);
} }