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

Merge branch 'fix-load-savegame' into 'master'

Browse source 
Fix netsave loading crash from saving gamedata

Closes #380

See merge request KartKrew/Kart!832
This commit is contained in:
Oni 2022-12-22 07:25:15 +00:00
commit 580de12d24
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_saveg.c
View file

@ -521,7 +521,7 @@ static void P_NetUnArchivePlayers(void)
players[i].skincolor = READUINT8(save_p); players[i].skincolor = READUINT8(save_p);
players[i].skin = READINT32(save_p); players[i].skin = READINT32(save_p);
for (j = 0; i < MAXAVAILABILITY; j++) for (j = 0; j < MAXAVAILABILITY; j++)
{ {
players[i].availabilities[j] = READUINT8(save_p); players[i].availabilities[j] = READUINT8(save_p);
} }
@ -4867,6 +4867,7 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
{ {
size_t i, j; size_t i, j;
size_t numTasks; size_t numTasks;
UINT8 *old_save_p;
if (READUINT32(save_p) != ARCHIVEBLOCK_MISC) if (READUINT32(save_p) != ARCHIVEBLOCK_MISC)
I_Error("Bad $$$.sav at archive block Misc"); I_Error("Bad $$$.sav at archive block Misc");
@ -4909,12 +4910,17 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
encoremode = (boolean)READUINT8(save_p); encoremode = (boolean)READUINT8(save_p);
// FIXME: save_p should not be global!!!
old_save_p = save_p;
if (!P_LoadLevel(true, reloading)) if (!P_LoadLevel(true, reloading))
{ {
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n")); CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
return false; return false;
} }
save_p = old_save_p;
// get the time // get the time
leveltime = READUINT32(save_p); leveltime = READUINT32(save_p);
lastmap = READINT16(save_p); lastmap = READINT16(save_p);