Merge branch 'fix-prison-desync' into 'master'

Netsync maptargets + nummapboxes (fix netplay Prison desyncs)

Closes #1280

See merge request KartKrew/Kart!2285
This commit is contained in:
toaster 2024-04-14 21:30:24 +00:00
commit 328714cf13

View file

@ -6569,6 +6569,9 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending)
// SRB2kart
WRITEINT32(save->p, numgotboxes);
WRITEUINT8(save->p, numtargets);
WRITEUINT8(save->p, maptargets);
WRITEUINT32(save->p, nummapboxes);
WRITEUINT8(save->p, battleprisons);
WRITEUINT32(save->p, g_emeraldWin);
@ -6761,6 +6764,8 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
// SRB2kart
numgotboxes = READINT32(save->p);
numtargets = READUINT8(save->p);
maptargets = READUINT8(save->p);
nummapboxes = READINT32(save->p);
battleprisons = (boolean)READUINT8(save->p);
g_emeraldWin = (tic_t)READUINT32(save->p);