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

Merge branch 'spectator-hud-spacing' into 'master'

Browse source 
Fix spectator HUD spacing

Closes #1162

See merge request KartKrew/Kart!2111
This commit is contained in:
AJ Martinez 2024-03-16 04:01:55 +00:00
commit c53ad541ab
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/hud/spectator.cpp
View file

@ -55,7 +55,7 @@ struct List
col.text(label_);
col = col.x(left ? -(kButtonWidth + kButtonMargin) : width() - (kButtonWidth + kFieldSpacing));
if (r_splitscreen)
//if (r_splitscreen)
{
auto small_button_offset = [&]
{
@ -72,10 +72,12 @@ struct List
col.y(small_button_offset()).small_button(button_, pressed_);
}
#if 0
else
{
col.y(-4).button(button_, pressed_);
}
#endif
}
private:
@ -112,7 +114,8 @@ struct List
col = col.x(field.width());
}
row_ = row_.y(r_splitscreen ? -13 : -17);
//row_ = row_.y(r_splitscreen ? -13 : -17);
row_ = row_.y(-13);
}
private:
@ -173,13 +176,13 @@ void K_drawSpectatorHUD(boolean director)
switch (r_splitscreen)
{
case 0:
return List(director ? 80 : 20, 20);
return List(director ? 20 : 20, 34);
case 1:
return List(40, 20);
return List(40, 30);
default:
return List(10, 20);
return List(10, 24);
}
}();

30
src/st_stuff.c
View file

@ -1286,6 +1286,24 @@ static void ST_overlayDrawer(void)
INT32 y = (BASEVIDHEIGHT / (r_splitscreen + 1)) - 34;
INT32 width = 50;
const char *text = player_names[stplyr-players];
int font = KART_FONT;
fixed_t textwidth = V_StringScaledWidth(FRACUNIT, FRACUNIT, FRACUNIT, flags, font, text);
fixed_t threshold = textwidth;
// k_drawKartHUD
if (gametyperules & GTR_CIRCUIT)
threshold = 200*FRACUNIT;
else if (gametyperules & GTR_BUMPERS)
threshold = 100*FRACUNIT;
if (LUA_HudEnabled(hud_gametypeinfo) && textwidth > threshold)
{
y += 5;
font = TINY_FONT;
textwidth = V_StringScaledWidth(FRACUNIT, FRACUNIT, FRACUNIT, flags, font, text);
}
if (r_splitscreen)
{
flags = (flags & ~V_ALPHAMASK) | V_HUDTRANSHALF;
@ -1297,14 +1315,18 @@ static void ST_overlayDrawer(void)
V_DrawCenteredThinString(x, y, flags | V_ORANGEMAP, "Watching");
}
const char *text = player_names[stplyr-players];
fixed_t textwidth = V_StringScaledWidth(FRACUNIT, FRACUNIT, FRACUNIT, flags, KART_FONT, text);
V_DrawStringScaled(x*FRACUNIT - textwidth/2, (y+10)*FRACUNIT,
FRACUNIT, FRACUNIT, FRACUNIT, flags, NULL, KART_FONT, text);
FRACUNIT, FRACUNIT, FRACUNIT, flags, NULL, font, text);
}
else
{
V_DrawCenteredThinString((vid.width/vid.dupx)/4, BASEVIDHEIGHT/2 - 12, V_HUDTRANSHALF|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_SPLITSCREEN, player_names[stplyr-players]);
INT32 y = BASEVIDHEIGHT/2 - 12;
INT32 f = V_HUDTRANSHALF|V_SNAPTOBOTTOM|V_SPLITSCREEN;
const char *s = player_names[stplyr-players];
if (viewnum & 1)
V_DrawThinString(12, y, f|V_SNAPTOLEFT, s);
else
V_DrawRightAlignedThinString(BASEVIDWIDTH/2 - 12, y, f|V_SNAPTORIGHT, s);
}
}
}