thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-09 16:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'baildrop-hud' into 'master'

Browse source 
Show baildrop in HUD as SUPER RING DEBT

See merge request kart-krew-dev/ring-racers-internal!2810
This commit is contained in:
Oni VelocitOni 2025-09-13 02:10:50 +00:00
commit bbbda96272
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/k_hud.cpp
View file

@ -4417,12 +4417,20 @@ static void K_drawRingCounter(boolean gametypeinfoshown)
}
}
INT32 hr = stplyr->hudrings;
if (stplyr->hudrings < 0) // Draw the minus for ring debt
if (stplyr->baildrop)
hr += -1 * (stplyr->baildrop / BAIL_DROPFREQUENCY);
if (hr < -999)
hr = -999;
if (hr < 0) // Draw the minus for ring debt
{
V_DrawMappedPatch(fr+11, fy, V_HUDTRANS|V_SLIDEIN|splitflags, kp_ringdebtminussmall, ringmap);
V_DrawMappedPatch(fr+15, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[rn[0]], ringmap);
V_DrawMappedPatch(fr+19, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[rn[1]], ringmap);
using srb2::Draw;
Draw row = Draw(fr+15, fy).flags(V_HUDTRANS|V_SLIDEIN|splitflags).font(Draw::Font::kPing).colormap(ringmap);
row.text("{:02}", abs(hr));
}
else
{
@ -4503,14 +4511,22 @@ static void K_drawRingCounter(boolean gametypeinfoshown)
}
}
INT32 hr = stplyr->hudrings;
if (stplyr->baildrop)
hr += -1 * (stplyr->baildrop / BAIL_DROPFREQUENCY);
if (hr < -999)
hr = -999;
// "Why fy-4? Why LAPS_X+29+1?"
// "use magic numbers" - jartha 2024-03-05
if (stplyr->hudrings < 0) // Draw the minus for ring debt
if (hr < 0) // Draw the minus for ring debt
{
V_DrawMappedPatch(LAPS_X+23-1, fy, V_HUDTRANS|V_SLIDEIN|splitflags, kp_ringdebtminus, ringmap);
using srb2::Draw;
Draw row = Draw(LAPS_X+29+0, fy-4).flags(V_HUDTRANS|V_SLIDEIN|splitflags).font(Draw::Font::kThinTimer).colormap(ringmap);
row.text("{:02}", abs(stplyr->hudrings));
row.text("{:02}", abs(hr));
// V_DrawMappedPatch(LAPS_X+29, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[TALLNUM_FONT].font[rn[0]], ringmap);
// V_DrawMappedPatch(LAPS_X+35, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[TALLNUM_FONT].font[rn[1]], ringmap);
}
@ -4518,7 +4534,7 @@ static void K_drawRingCounter(boolean gametypeinfoshown)
{
using srb2::Draw;
Draw row = Draw(LAPS_X+23+3, fy-4).flags(V_HUDTRANS|V_SLIDEIN|splitflags).font(Draw::Font::kThinTimer).colormap(ringmap);
row.text("{:02}", abs(stplyr->hudrings));
row.text("{:02}", abs(hr));
// V_DrawMappedPatch(LAPS_X+23, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[TALLNUM_FONT].font[rn[0]], ringmap);
// V_DrawMappedPatch(LAPS_X+29, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[TALLNUM_FONT].font[rn[1]], ringmap);
}