thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert netvars after demo finishes playback

Browse source 
(Demos do not call CL_Reset BTW.)
This commit is contained in:
James R 2021-07-08 14:37:03 -07:00 • committed by toaster
parent e07fb31f72
commit 4c9c54e44e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/command.c
View file

@ -1679,6 +1679,8 @@ void CV_SaveVars(UINT8 **p, boolean in_demo)
static void CV_LoadVars(UINT8 **p, static void CV_LoadVars(UINT8 **p,
consvar_t *(*got)(UINT8 **p, char **ret_value, boolean *ret_stealth)) consvar_t *(*got)(UINT8 **p, char **ret_value, boolean *ret_stealth))
{ {
const boolean store = (client || demo.playback);
consvar_t *cvar; consvar_t *cvar;
UINT16 count; UINT16 count;
@ -1692,7 +1694,7 @@ static void CV_LoadVars(UINT8 **p,
{ {
if (cvar->flags & CV_NETVAR) if (cvar->flags & CV_NETVAR)
{ {
if (client && cvar->revert.v.string == NULL) if (store && cvar->revert.v.string == NULL)
{ {
cvar->revert.v.const_munge = cvar->string; cvar->revert.v.const_munge = cvar->string;
cvar->revert.allocated = ( cvar->zstring != NULL ); cvar->revert.allocated = ( cvar->zstring != NULL );

3
src/d_clisrv.c
View file

@ -2409,7 +2409,6 @@ void CL_Reset(void)
doomcom->numslots = 1; doomcom->numslots = 1;
SV_StopServer(); SV_StopServer();
SV_ResetServer(); SV_ResetServer();
CV_RevertNetVars();
// make sure we don't leave any fileneeded gunk over from a failed join // make sure we don't leave any fileneeded gunk over from a failed join
fileneedednum = 0; fileneedednum = 0;
@ -3184,6 +3183,8 @@ void SV_ResetServer(void)
// clear server_context // clear server_context
memset(server_context, '-', 8); memset(server_context, '-', 8);
CV_RevertNetVars();
DEBFILE("\n-=-=-=-=-=-=-= Server Reset =-=-=-=-=-=-=-\n\n"); DEBFILE("\n-=-=-=-=-=-=-= Server Reset =-=-=-=-=-=-=-\n\n");
} }