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

Change indentation/bracketing on gamedata load for map records

Browse source 
To make the next commit less painful to parse.
Also fixes signedness of mapnum from INT16 to UINT16
This commit is contained in:
toaster 2023-08-19 14:44:01 +01:00
parent fb8795c8da
commit be1d3e49e8
1 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/g_game.c
View file

@ -4680,53 +4680,58 @@ void G_LoadGameData(void)
numgamedatamapheaders = READUINT32(save.p); numgamedatamapheaders = READUINT32(save.p);
for (i = 0; i < numgamedatamapheaders; i++) if (numgamedatamapheaders)
{ {
char mapname[MAXMAPLUMPNAME];
INT16 mapnum;
READSTRINGL(save.p, mapname, MAXMAPLUMPNAME); for (i = 0; i < numgamedatamapheaders; i++)
mapnum = G_MapNumber(mapname);
recorddata_t dummyrecord;
dummyrecord.mapvisited = READUINT8(save.p);
dummyrecord.time = (tic_t)READUINT32(save.p);
dummyrecord.lap = (tic_t)READUINT32(save.p);
if (mapnum < nummapheaders && mapheaderinfo[mapnum])
{ {
// Valid mapheader, time to populate with record data. char mapname[MAXMAPLUMPNAME];
UINT16 mapnum;
dummyrecord.mapvisited &= MV_MAX; READSTRINGL(save.p, mapname, MAXMAPLUMPNAME);
M_Memcpy(&mapheaderinfo[mapnum]->records, &dummyrecord, sizeof(recorddata_t)); mapnum = G_MapNumber(mapname);
}
else if (
((dummyrecord.mapvisited & MV_PERSISTUNLOADED) != 0
&& (dummyrecord.mapvisited & MV_BEATEN) != 0)
|| dummyrecord.time != 0
|| dummyrecord.lap != 0
)
{
// Invalid, but we don't want to lose all the juicy statistics.
// Instead, update a FILO linked list of "unloaded mapheaders".
unloaded_mapheader_t *unloadedmap =
Z_Malloc(
sizeof(unloaded_mapheader_t),
PU_STATIC, NULL
);
// Establish properties, for later retrieval on file add. recorddata_t dummyrecord;
unloadedmap->lumpname = Z_StrDup(mapname);
unloadedmap->lumpnamehash = quickncasehash(unloadedmap->lumpname, MAXMAPLUMPNAME);
// Insert at the head, just because it's convenient. dummyrecord.mapvisited = READUINT8(save.p);
unloadedmap->next = unloadedmapheaders; dummyrecord.time = (tic_t)READUINT32(save.p);
unloadedmapheaders = unloadedmap; dummyrecord.lap = (tic_t)READUINT32(save.p);
// Finally, copy into. if (mapnum < nummapheaders && mapheaderinfo[mapnum])
M_Memcpy(&unloadedmap->records, &dummyrecord, sizeof(recorddata_t)); {
// Valid mapheader, time to populate with record data.
dummyrecord.mapvisited &= MV_MAX;
M_Memcpy(&mapheaderinfo[mapnum]->records, &dummyrecord, sizeof(recorddata_t));
}
else if (
((dummyrecord.mapvisited & MV_PERSISTUNLOADED) != 0
&& (dummyrecord.mapvisited & MV_BEATEN) != 0)
|| dummyrecord.time != 0
|| dummyrecord.lap != 0
)
{
// Invalid, but we don't want to lose all the juicy statistics.
// Instead, update a FILO linked list of "unloaded mapheaders".
unloaded_mapheader_t *unloadedmap =
Z_Malloc(
sizeof(unloaded_mapheader_t),
PU_STATIC, NULL
);
// Establish properties, for later retrieval on file add.
unloadedmap->lumpname = Z_StrDup(mapname);
unloadedmap->lumpnamehash = quickncasehash(unloadedmap->lumpname, MAXMAPLUMPNAME);
// Insert at the head, just because it's convenient.
unloadedmap->next = unloadedmapheaders;
unloadedmapheaders = unloadedmap;
// Finally, copy into.
M_Memcpy(&unloadedmap->records, &dummyrecord, sizeof(recorddata_t));
}
} }
} }