thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Depointerify several properties on y_data

Browse source 
- character is written directly
- color is written directly
- no more duplication of the player_names pointer
This commit is contained in:
toaster 2023-05-11 16:16:36 +01:00
parent d581389c9c
commit 77aa563a74
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/y_inter.c
View file

@ -64,10 +64,9 @@ typedef struct
typedef struct typedef struct
{ {
INT32 *character[MAXPLAYERS]; // Character # UINT8 character[MAXPLAYERS]; // Character #
UINT16 *color[MAXPLAYERS]; // Color # UINT16 color[MAXPLAYERS]; // Color #
SINT8 num[MAXPLAYERS]; // Player # SINT8 num[MAXPLAYERS]; // Player #
char *name[MAXPLAYERS]; // Player's name
UINT8 numplayers; // Number of players being displayed UINT8 numplayers; // Number of players being displayed
UINT8 mainplayer; // Most successful local player UINT8 mainplayer; // Most successful local player
@ -252,9 +251,8 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
completed[i] = true; completed[i] = true;
data.color[data.numplayers] = &players[i].skincolor; data.color[data.numplayers] = players[i].skincolor;
data.character[data.numplayers] = &players[i].skin; data.character[data.numplayers] = players[i].skin;
data.name[data.numplayers] = player_names[i];
if (data.numplayers && (data.val[data.numplayers] == data.val[data.numplayers-1])) if (data.numplayers && (data.val[data.numplayers] == data.val[data.numplayers-1]))
{ {
@ -280,9 +278,9 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
{ {
G_WriteStanding( G_WriteStanding(
data.pos[data.numplayers], data.pos[data.numplayers],
data.name[data.numplayers], player_names[i],
*data.character[data.numplayers], data.character[data.numplayers],
*data.color[data.numplayers], data.color[data.numplayers],
data.val[data.numplayers] data.val[data.numplayers]
); );
} }
@ -473,18 +471,16 @@ void Y_PlayerStandingsDrawer(INT32 xoffset)
if (data.rankingsmode == 0 && (players[data.num[i]].pflags & PF_NOCONTEST) && players[data.num[i]].bot) if (data.rankingsmode == 0 && (players[data.num[i]].pflags & PF_NOCONTEST) && players[data.num[i]].bot)
{ {
// RETIRED !! // RETIRED !!
charcolormap = R_GetTranslationColormap(TC_DEFAULT, *data.color[i], GTC_CACHE); charcolormap = R_GetTranslationColormap(TC_DEFAULT, data.color[i], GTC_CACHE);
V_DrawMappedPatch(x+14, y-5, 0, W_CachePatchName("MINIDEAD", PU_CACHE), charcolormap); V_DrawMappedPatch(x+14, y-5, 0, W_CachePatchName("MINIDEAD", PU_CACHE), charcolormap);
} }
else else
{ {
charcolormap = R_GetTranslationColormap(*data.character[i], *data.color[i], GTC_CACHE); charcolormap = R_GetTranslationColormap(data.character[i], data.color[i], GTC_CACHE);
V_DrawMappedPatch(x+14, y-5, 0, faceprefix[*data.character[i]][FACE_MINIMAP], charcolormap); V_DrawMappedPatch(x+14, y-5, 0, faceprefix[data.character[i]][FACE_MINIMAP], charcolormap);
} }
} }
STRBUFCPY(strtime, data.name[i]);
/* y2 = y; /* y2 = y;
if ((netgame || (demo.playback && demo.netgame)) && playerconsole[data.num[i]] == 0 && server_lagless && !players[data.num[i]].bot) if ((netgame || (demo.playback && demo.netgame)) && playerconsole[data.num[i]] == 0 && server_lagless && !players[data.num[i]].bot)
@ -523,7 +519,7 @@ void Y_PlayerStandingsDrawer(INT32 xoffset)
? hilicol ? hilicol
: 0 : 0
)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, )|V_ALLOWLOWERCASE|V_6WIDTHSPACE,
strtime player_names[data.num[i]]
); );
strtime[0] = '\0'; strtime[0] = '\0';