From 0485b4cf5c922f7dd85ef96fba3a613b894c1a12 Mon Sep 17 00:00:00 2001 From: fickleheart Date: Mon, 25 Mar 2019 22:49:37 -0500 Subject: [PATCH] Make sure clients never have local_resynchinprogress on when joining a game... --- src/d_clisrv.c | 2 ++ src/d_net.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index ba0446c0..811645da 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2304,6 +2304,8 @@ static void CL_ConnectToServer(boolean viams) if (gamestate == GS_VOTING) Y_EndVote(); + resynch_local_inprogress = false; // Just in case this was never cleared... + DEBFILE(va("waiting %d nodes\n", doomcom->numnodes)); G_SetGamestate(GS_WAITINGPLAYERS); wipegamestate = GS_WAITINGPLAYERS; diff --git a/src/d_net.c b/src/d_net.c index 164be502..0219f24d 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -1474,6 +1474,7 @@ void D_CloseConnection(void) I_NetMakeNodewPort = NULL; netgame = false; addedtogame = false; + resynch_local_inprogress = false; // No more resyncing! } D_ResetTiccmds();