Merge branch 'master' into next
This commit is contained in:
commit
7ac1b9298f
|
@ -2557,6 +2557,7 @@ void CL_Reset(void)
|
||||||
multiplayer = false;
|
multiplayer = false;
|
||||||
servernode = 0;
|
servernode = 0;
|
||||||
server = true;
|
server = true;
|
||||||
|
resynch_local_inprogress = false;
|
||||||
doomcom->numnodes = 1;
|
doomcom->numnodes = 1;
|
||||||
doomcom->numslots = 1;
|
doomcom->numslots = 1;
|
||||||
SV_StopServer();
|
SV_StopServer();
|
||||||
|
|
Loading…
Reference in a new issue