vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Try to fix compiler errors

Browse source
This commit is contained in:
James R 2019-02-24 17:47:33 -08:00
parent 1fa32a4b9d
commit e35f65eee2
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/command.c
View file

@ -1355,7 +1355,7 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
Setvalue(cvar, svalue, stealth); Setvalue(cvar, svalue, stealth);
} }
void CV_SaveNetVars(UINT8 **p, boolean demorecording) void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
{ {
consvar_t *cvar; consvar_t *cvar;
UINT8 *count_p = *p; UINT8 *count_p = *p;
@ -1365,12 +1365,12 @@ void CV_SaveNetVars(UINT8 **p, boolean demorecording)
// 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)) || (demorecording && cvar->netid == cv_numlaps.netid)) if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
{ {
WRITEUINT16(*p, cvar->netid); WRITEUINT16(*p, cvar->netid);
// UGLY HACK: Save proper lap count in net replays // UGLY HACK: Save proper lap count in net replays
if (demorecording && cvar->netid == cv_numlaps.netid) if (isdemorecording && 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)

2
src/command.h
View file

@ -160,7 +160,7 @@ void CV_AddValue(consvar_t *var, INT32 increment);
void CV_SaveVariables(FILE *f); void CV_SaveVariables(FILE *f);
// load/save gamesate (load and save option and for network join in game) // load/save gamesate (load and save option and for network join in game)
void CV_SaveNetVars(UINT8 **p, boolean demorecording); void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
void CV_LoadNetVars(UINT8 **p); void CV_LoadNetVars(UINT8 **p);
// reset cheat netvars after cheats is deactivated // reset cheat netvars after cheats is deactivated

2
src/g_game.c
View file

@ -5074,7 +5074,7 @@ void G_WriteGhostTic(mobj_t *ghost)
if (abs(ghost->x-oldghost.x) > MAXMOM if (abs(ghost->x-oldghost.x) > MAXMOM
|| abs(ghost->y-oldghost.y) > MAXMOM || abs(ghost->y-oldghost.y) > MAXMOM
|| abs(ghost->z-oldghost.z) > MAXMOM || abs(ghost->z-oldghost.z) > MAXMOM
|| leveltime & 255 == 1) // Hack to enable slightly nicer resyncing || ( leveltime & 255 == 1 )) // Hack to enable slightly nicer resyncing
{ {
oldghost.x = ghost->x; oldghost.x = ghost->x;
oldghost.y = ghost->y; oldghost.y = ghost->y;

2
src/st_stuff.c
View file

@ -1918,9 +1918,9 @@ static void ST_overlayDrawer(void)
else if (splitscreen == 1) else if (splitscreen == 1)
{ {
char name[MAXPLAYERNAME+12]; char name[MAXPLAYERNAME+12];
sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
INT32 y = (stplyr == &players[displayplayer]) ? 8 : BASEVIDHEIGHT/2-16; INT32 y = (stplyr == &players[displayplayer]) ? 8 : BASEVIDHEIGHT/2-16;
sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name); V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name);
} }
else if (splitscreen) else if (splitscreen)