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

Merge command.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 11:42:12 -04:00
parent bd54a2ddd9
commit 71375e412b
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/command.c
View file

@ -1677,11 +1677,7 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
Setvalue(cvar, svalue, stealth); Setvalue(cvar, svalue, stealth);
} }
<<<<<<< HEAD
void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
=======
void CV_SaveVars(UINT8 **p, boolean in_demo) void CV_SaveVars(UINT8 **p, boolean in_demo)
>>>>>>> srb2/next
{ {
consvar_t *cvar; consvar_t *cvar;
UINT8 *count_p = *p; UINT8 *count_p = *p;
@ -1691,13 +1687,15 @@ void CV_SaveVars(UINT8 **p, boolean in_demo)
// the client will reset all netvars to default before loading // the client will reset all netvars to default before loading
WRITEUINT16(*p, 0x0000); WRITEUINT16(*p, 0x0000);
for (cvar = consvar_vars; cvar; cvar = cvar->next) for (cvar = consvar_vars; cvar; cvar = cvar->next)
if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid)) if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (in_demo && cvar->netid == cv_numlaps.netid))
{ {
<<<<<<< HEAD if (in_demo)
WRITEUINT16(*p, cvar->netid); WRITESTRING(*p, cvar->name);
else
WRITEUINT16(*p, cvar->netid);
// UGLY HACK: Save proper lap count in net replays // UGLY HACK: Save proper lap count in net replays
if (isdemorecording && cvar->netid == cv_numlaps.netid) if (in_demo && cvar->netid == cv_numlaps.netid)
{ {
if (cv_basenumlaps.value && if (cv_basenumlaps.value &&
(!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE) (!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)
@ -1718,13 +1716,6 @@ void CV_SaveVars(UINT8 **p, boolean in_demo)
WRITESTRING(*p, cvar->string); WRITESTRING(*p, cvar->string);
} }
=======
if (in_demo)
WRITESTRING(*p, cvar->name);
else
WRITEUINT16(*p, cvar->netid);
WRITESTRING(*p, cvar->string);
>>>>>>> srb2/next
WRITEUINT8(*p, false); WRITEUINT8(*p, false);
++count; ++count;
} }