diff --git a/src/p_saveg.c b/src/p_saveg.c index 51aff8c48..e054ef45d 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -229,6 +229,11 @@ static void P_NetArchivePlayers(savebuffer_t *save) if (flags & FOLLOWER) WRITEUINT32(save->p, players[i].follower->mobjnum); + for (j = 0; j < NUMPOWERS; j++) + WRITEUINT16(save->p, players[i].powers[j]); + for (j = 0; j < NUMKARTSTUFF; j++) + WRITEINT32(save->p, players[i].kartstuff[j]); + WRITEUINT16(save->p, players[i].nocontrol); WRITEUINT8(save->p, players[i].carry); WRITEUINT16(save->p, players[i].dye); @@ -427,11 +432,6 @@ static void P_NetArchivePlayers(savebuffer_t *save) // Fix janky landing particle WRITEUINT8(save->p, players[i].prevonground); - for (j = 0; j < NUMPOWERS; j++) - WRITEUINT16(save->p, players[i].powers[j]); - for (j = 0; j < NUMKARTSTUFF; j++) - WRITEINT32(save->p, players[i].kartstuff[j]); - } TracyCZoneEnd(__zone); } @@ -566,6 +566,11 @@ static void P_NetUnArchivePlayers(savebuffer_t *save) if (flags & FOLLOWER) players[i].follower = (mobj_t *)(size_t)READUINT32(save->p); + for (j = 0; j < NUMPOWERS; j++) + players[i].powers[j] = READUINT16(save->p); + for (j = 0; j < NUMKARTSTUFF; j++) + players[i].kartstuff[j] = READINT32(save->p); + players[i].nocontrol = READUINT16(save->p); players[i].carry = READUINT8(save->p); players[i].dye = READUINT16(save->p); @@ -766,11 +771,6 @@ static void P_NetUnArchivePlayers(savebuffer_t *save) // Fix janky landing particle players[i].prevonground = READUINT8(save->p); - for (j = 0; j < NUMPOWERS; j++) - players[i].powers[j] = READUINT16(save->p); - for (j = 0; j < NUMKARTSTUFF; j++) - players[i].kartstuff[j] = READINT32(save->p); - //players[i].viewheight = P_GetPlayerViewHeight(players[i]); // scale cannot be factored in at this point } TracyCZoneEnd(__zone); diff --git a/src/r_main.cpp b/src/r_main.cpp index cbd029778..064de28ef 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -158,7 +158,7 @@ static void Fov_OnChange(void); consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL); // if enabled, load all graphics at level load -consvar_t cv_precachetextures = CVAR_INIT ("precachetextures", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL); +consvar_t cv_precachetextures = CVAR_INIT ("precachetextures", "On", CV_SAVE, CV_OnOff, NULL); consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS] = { CVAR_INIT ("chasecam", "On", 0, CV_OnOff, NULL),