From bee9aaee632db077dc1d85cf3c01ca3a36c68198 Mon Sep 17 00:00:00 2001 From: Ashnal Date: Thu, 20 Feb 2020 22:02:23 -0500 Subject: [PATCH] Game connects and somewhat plays ... still many problems and crashes --- src/p_saveg.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/p_saveg.c b/src/p_saveg.c index feafdabde..26604d43f 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -442,6 +442,12 @@ static void P_NetUnArchivePlayers(void) // SRB2kart players[i].kartspeed = READUINT8(save_p); players[i].kartweight = READUINT8(save_p); + + for (j = 0; j < MAXPREDICTTICS; j++) + { + players[i].lturn_max[j] = READINT16(save_p); + players[i].rturn_max[j] = READINT16(save_p); + } } } @@ -700,13 +706,6 @@ static void P_NetUnArchiveColormaps(void) if (i < num_net_colormaps-1 && !exc_next) exc_next = R_CreateDefaultColormap(false); } - - for (j = 0; j < MAXPREDICTTICS; j++) - { - players[i].lturn_max[j] = READINT16(save_p); - players[i].rturn_max[j] = READINT16(save_p); - } - } } */ @@ -4537,6 +4536,22 @@ static inline boolean P_NetUnArchiveMisc(boolean preserveLevel) // SRB2kart numgotboxes = READINT32(save_p); + + gamespeed = READUINT8(save_p); + franticitems = (boolean)READUINT8(save_p); + comeback = (boolean)READUINT8(save_p); + + for (i = 0; i < 4; i++) + battlewanted[i] = READSINT8(save_p); + + wantedcalcdelay = READUINT32(save_p); + indirectitemcooldown = READUINT32(save_p); + hyubgone = READUINT32(save_p); + mapreset = READUINT32(save_p); + nospectategrief = READUINT8(save_p); + thwompsactive = (boolean)READUINT8(save_p); + spbplace = READSINT8(save_p); + // Is it paused? if (READUINT8(save_p) == 0x2f) paused = true;