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

Emeralds are on ranking

Browse source
This commit is contained in:
Sally Coolatta 2020-11-02 04:23:31 -05:00
parent 4a9a438270
commit e478d542a0
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/k_hud.c
View file

@ -88,6 +88,7 @@ static patch_t *kp_rankbumper;
static patch_t *kp_tinybumper[2]; static patch_t *kp_tinybumper[2];
static patch_t *kp_ranknobumpers; static patch_t *kp_ranknobumpers;
static patch_t *kp_rankcapsule; static patch_t *kp_rankcapsule;
static patch_t *kp_rankemeralds[7];
static patch_t *kp_battlewin; static patch_t *kp_battlewin;
static patch_t *kp_battlecool; static patch_t *kp_battlecool;
@ -351,6 +352,13 @@ void K_LoadKartHUDGraphics(void)
kp_ranknobumpers = W_CachePatchName("K_NOBLNS", PU_HUDGFX); kp_ranknobumpers = W_CachePatchName("K_NOBLNS", PU_HUDGFX);
kp_rankcapsule = W_CachePatchName("K_CAPICO", PU_HUDGFX); kp_rankcapsule = W_CachePatchName("K_CAPICO", PU_HUDGFX);
sprintf(buffer, "K_EMERCx");
for (i = 0; i < 7; i++)
{
buffer[7] = '0'+(i+1);
kp_rankemeralds[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
// Battle graphics // Battle graphics
kp_battlewin = W_CachePatchName("K_BWIN", PU_HUDGFX); kp_battlewin = W_CachePatchName("K_BWIN", PU_HUDGFX);
kp_battlecool = W_CachePatchName("K_BCOOL", PU_HUDGFX); kp_battlecool = W_CachePatchName("K_BCOOL", PU_HUDGFX);
@ -1515,7 +1523,7 @@ static boolean K_drawKartPositionFaces(void)
INT32 i, j, ranklines, strank = -1; INT32 i, j, ranklines, strank = -1;
boolean completed[MAXPLAYERS]; boolean completed[MAXPLAYERS];
INT32 rankplayer[MAXPLAYERS]; INT32 rankplayer[MAXPLAYERS];
INT32 bumperx, numplayersingame = 0; INT32 bumperx, emeraldx, numplayersingame = 0;
UINT8 *colormap; UINT8 *colormap;
ranklines = 0; ranklines = 0;
@ -1596,6 +1604,7 @@ static boolean K_drawKartPositionFaces(void)
if (!players[rankplayer[i]].mo) continue; if (!players[rankplayer[i]].mo) continue;
bumperx = FACE_X+19; bumperx = FACE_X+19;
emeraldx = FACE_X+16;
if (players[rankplayer[i]].mo->color) if (players[rankplayer[i]].mo->color)
{ {
@ -1609,7 +1618,7 @@ static boolean K_drawKartPositionFaces(void)
if (LUA_HudEnabled(hud_battlebumpers)) if (LUA_HudEnabled(hud_battlebumpers))
{ {
if (gametype == GT_BATTLE && players[rankplayer[i]].bumpers > 0) if ((gametyperules & GTR_BUMPERS) && players[rankplayer[i]].bumpers > 0)
{ {
V_DrawMappedPatch(bumperx-2, Y, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_tinybumper[0], colormap); V_DrawMappedPatch(bumperx-2, Y, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_tinybumper[0], colormap);
for (j = 1; j < players[rankplayer[i]].bumpers; j++) for (j = 1; j < players[rankplayer[i]].bumpers; j++)
@ -1618,7 +1627,18 @@ static boolean K_drawKartPositionFaces(void)
V_DrawMappedPatch(bumperx, Y, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_tinybumper[1], colormap); V_DrawMappedPatch(bumperx, Y, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_tinybumper[1], colormap);
} }
} }
} // A new level of stupidity: checking if lua is enabled to close a bracket. :Fascinating: }
}
for (j = 0; j < 7; j++)
{
UINT32 emeraldFlag = (1 << j);
if (players[rankplayer[i]].powers[pw_emeralds] & emeraldFlag)
{
V_DrawScaledPatch(emeraldx, Y+7, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_rankemeralds[j]);
emeraldx += 7;
}
} }
if (i == strank) if (i == strank)