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

Fix the width of the pending keys for gamedata to prevent unintentional rollover

Browse source
This commit is contained in:
toaster 2023-05-30 21:09:15 +01:00
parent 0c7d66791b
commit cc29c23ac6
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/g_game.c
View file

@ -4878,7 +4878,16 @@ void G_LoadGameData(void)
gamedata->pendingkeyrounds = READUINT32(save.p); gamedata->pendingkeyrounds = READUINT32(save.p);
gamedata->pendingkeyroundoffset = READUINT8(save.p); gamedata->pendingkeyroundoffset = READUINT8(save.p);
gamedata->keyspending = READUINT8(save.p);
if (versionMinor < 3)
{
gamedata->keyspending = READUINT8(save.p);
}
else
{
gamedata->keyspending = READUINT16(save.p);
}
gamedata->chaokeys = READUINT16(save.p); gamedata->chaokeys = READUINT16(save.p);
gamedata->everloadedaddon = (boolean)READUINT8(save.p); gamedata->everloadedaddon = (boolean)READUINT8(save.p);
@ -5277,7 +5286,7 @@ void G_SaveGameData(void)
length = (4+1+1+ length = (4+1+1+
4+4+ 4+4+
(4*GDGT_MAX)+ (4*GDGT_MAX)+
4+1+1+2+ 4+1+2+2+
1+1+1+ 1+1+1+
4+ 4+
(MAXEMBLEMS+(MAXUNLOCKABLES*2)+MAXCONDITIONSETS)+ (MAXEMBLEMS+(MAXUNLOCKABLES*2)+MAXCONDITIONSETS)+
@ -5412,7 +5421,7 @@ void G_SaveGameData(void)
WRITEUINT32(save.p, gamedata->pendingkeyrounds); // 4 WRITEUINT32(save.p, gamedata->pendingkeyrounds); // 4
WRITEUINT8(save.p, gamedata->pendingkeyroundoffset); // 1 WRITEUINT8(save.p, gamedata->pendingkeyroundoffset); // 1
WRITEUINT8(save.p, gamedata->keyspending); // 1 WRITEUINT16(save.p, gamedata->keyspending); // 2
WRITEUINT16(save.p, gamedata->chaokeys); // 2 WRITEUINT16(save.p, gamedata->chaokeys); // 2
WRITEUINT8(save.p, gamedata->everloadedaddon); // 1 WRITEUINT8(save.p, gamedata->everloadedaddon); // 1

2
src/m_cond.h
View file

@ -273,7 +273,7 @@ struct gamedata_t
// Chao Key condition bypass // Chao Key condition bypass
UINT32 pendingkeyrounds; UINT32 pendingkeyrounds;
UINT8 pendingkeyroundoffset; UINT8 pendingkeyroundoffset;
UINT8 keyspending; UINT16 keyspending;
UINT16 chaokeys; UINT16 chaokeys;
// SPECIFIC SPECIAL EVENTS // SPECIFIC SPECIAL EVENTS