mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-29 05:41:02 +00:00
Merge branch 'hud-is-fucked' into 'next'
HUD inconsistency in Record Attack See merge request KartKrew/Kart-Public!164
This commit is contained in:
commit
11331b7bc5
1 changed files with 4 additions and 4 deletions
|
@ -1797,10 +1797,12 @@ static void ST_doItemFinderIconsAndSound(void) // SRB2kart - unused.
|
||||||
//
|
//
|
||||||
static void ST_overlayDrawer(void)
|
static void ST_overlayDrawer(void)
|
||||||
{
|
{
|
||||||
/* SRB2kart doesn't need this stuff
|
|
||||||
//hu_showscores = auto hide score/time/rings when tab rankings are shown
|
//hu_showscores = auto hide score/time/rings when tab rankings are shown
|
||||||
if (!(hu_showscores && (netgame || multiplayer)))
|
if (!(hu_showscores && (netgame || multiplayer)))
|
||||||
{
|
{
|
||||||
|
K_drawKartHUD();
|
||||||
|
|
||||||
|
/* SRB2kart doesn't need this stuff
|
||||||
if (maptol & TOL_NIGHTS)
|
if (maptol & TOL_NIGHTS)
|
||||||
ST_drawNiGHTSHUD();
|
ST_drawNiGHTSHUD();
|
||||||
else
|
else
|
||||||
|
@ -1824,8 +1826,8 @@ static void ST_overlayDrawer(void)
|
||||||
)
|
)
|
||||||
ST_drawLives();
|
ST_drawLives();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
// GAME OVER pic
|
// GAME OVER pic
|
||||||
/*if (G_GametypeUsesLives() && stplyr->lives <= 0 && !(hu_showscores && (netgame || multiplayer)))
|
/*if (G_GametypeUsesLives() && stplyr->lives <= 0 && !(hu_showscores && (netgame || multiplayer)))
|
||||||
|
@ -1845,8 +1847,6 @@ static void ST_overlayDrawer(void)
|
||||||
// Countdown timer for Race Mode
|
// Countdown timer for Race Mode
|
||||||
// ...moved to k_kart.c so we can take advantage of the LAPS_Y value
|
// ...moved to k_kart.c so we can take advantage of the LAPS_Y value
|
||||||
|
|
||||||
K_drawKartHUD();
|
|
||||||
|
|
||||||
/* SRB2kart doesn't need this stuff, I think
|
/* SRB2kart doesn't need this stuff, I think
|
||||||
// If you are in overtime, put a big honkin' flashin' message on the screen.
|
// If you are in overtime, put a big honkin' flashin' message on the screen.
|
||||||
if (G_BattleGametype() && cv_overtime.value
|
if (G_BattleGametype() && cv_overtime.value
|
||||||
|
|
Loading…
Reference in a new issue