thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 23:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove a few more magic numbers

Browse source
This commit is contained in:
TehRealSalt 2019-09-23 08:31:36 -04:00
parent 38bb44e732
commit 9072f233eb
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_clisrv.c
View file

@ -1525,13 +1525,13 @@ static boolean SV_SendServerConfig(INT32 node)
memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers)); memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers));
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
for (j = 0; j < 2; j++) for (j = 0; j < PWRLV_NUMTYPES; j++)
netbuffer->u.servercfg.powerlevels[i][j] = 0; // Not sure if memset works on something like this netbuffer->u.servercfg.powerlevels[i][j] = 0; // Not sure if memset works on something like this
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i]; netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i];
for (j = 0; j < 2; j++) for (j = 0; j < PWRLV_NUMTYPES; j++)
netbuffer->u.servercfg.powerlevels[i][j] = clientpowerlevels[i][j]; netbuffer->u.servercfg.powerlevels[i][j] = clientpowerlevels[i][j];
if (!playeringame[i]) if (!playeringame[i])
@ -4131,7 +4131,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
for (j = 0; j < MAXPLAYERS; j++) for (j = 0; j < MAXPLAYERS; j++)
{ {
adminplayers[j] = netbuffer->u.servercfg.adminplayers[j]; adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
for (k = 0; k < 2; k++) for (k = 0; k < PWRLV_NUMTYPES; k++)
clientpowerlevels[j][k] = netbuffer->u.servercfg.powerlevels[j][k]; clientpowerlevels[j][k] = netbuffer->u.servercfg.powerlevels[j][k];
} }
memcpy(server_context, netbuffer->u.servercfg.server_context, 8); memcpy(server_context, netbuffer->u.servercfg.server_context, 8);

4
src/d_netcmd.c
View file

@ -1963,8 +1963,8 @@ void D_SendPlayerConfig(void)
UINT8 buf[4]; UINT8 buf[4];
UINT8 *buf_p = buf; UINT8 *buf_p = buf;
WRITEUINT16(buf_p, vspowerlevel[0]); WRITEUINT16(buf_p, vspowerlevel[PWRLV_RACE]);
WRITEUINT16(buf_p, vspowerlevel[1]); WRITEUINT16(buf_p, vspowerlevel[PWRLV_BATTLE]);
SendNetXCmd(XD_POWERLEVEL, buf, 4); SendNetXCmd(XD_POWERLEVEL, buf, 4);
} }

8
src/g_game.c
View file

@ -3049,7 +3049,7 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
if (netgame && cv_kartusepwrlv.value) if (netgame && cv_kartusepwrlv.value)
{ {
if (clientpowerlevels[j][0] == clientpowerlevels[i][0]) if (clientpowerlevels[j][PWRLV_RACE] == clientpowerlevels[i][PWRLV_RACE])
num++; num++;
} }
else else
@ -3070,7 +3070,7 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
{ {
if (netgame && cv_kartusepwrlv.value) if (netgame && cv_kartusepwrlv.value)
{ {
if (clientpowerlevels[i][0] > clientpowerlevels[playernum][0]) if (clientpowerlevels[i][PWRLV_RACE] > clientpowerlevels[playernum][PWRLV_RACE])
pos++; pos++;
} }
else else
@ -4113,7 +4113,7 @@ void G_LoadGameData(void)
totalplaytime = READUINT32(save_p); totalplaytime = READUINT32(save_p);
matchesplayed = READUINT32(save_p); matchesplayed = READUINT32(save_p);
for (i = 0; i < 2; i++) for (i = 0; i < PWRLV_NUMTYPES; i++)
vspowerlevel[i] = READUINT16(save_p); vspowerlevel[i] = READUINT16(save_p);
modded = READUINT8(save_p); modded = READUINT8(save_p);
@ -4261,7 +4261,7 @@ void G_SaveGameData(boolean force)
WRITEUINT32(save_p, totalplaytime); WRITEUINT32(save_p, totalplaytime);
WRITEUINT32(save_p, matchesplayed); WRITEUINT32(save_p, matchesplayed);
for (i = 0; i < 2; i++) for (i = 0; i < PWRLV_NUMTYPES; i++)
WRITEUINT16(save_p, vspowerlevel[i]); WRITEUINT16(save_p, vspowerlevel[i]);
btemp = (UINT8)(savemoddata); // what used to be here was profoundly dunderheaded btemp = (UINT8)(savemoddata); // what used to be here was profoundly dunderheaded

4
src/m_menu.c
View file

@ -7410,8 +7410,8 @@ static void M_DrawLevelStats(void)
V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, 0, va("%i played", matchesplayed)); V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, 0, va("%i played", matchesplayed));
V_DrawString(20, 52, highlightflags, "Online Power Level:"); V_DrawString(20, 52, highlightflags, "Online Power Level:");
V_DrawRightAlignedString(BASEVIDWIDTH-16, 52, 0, va("Race: %i", vspowerlevel[0])); V_DrawRightAlignedString(BASEVIDWIDTH-16, 52, 0, va("Race: %i", vspowerlevel[PWRLV_RACE]));
V_DrawRightAlignedString(BASEVIDWIDTH-16, 60, 0, va("Battle: %i", vspowerlevel[1])); V_DrawRightAlignedString(BASEVIDWIDTH-16, 60, 0, va("Battle: %i", vspowerlevel[PWRLV_BATTLE]));
for (i = 0; i < NUMMAPS; i++) for (i = 0; i < NUMMAPS; i++)
{ {