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 'last-minute-hud-fixes' into 'master'

Browse source 
Last Sealed Star GAME OVER HUD fixes; fix Save Replay prompt displaying the wrong button

Closes #1256 and #1253

See merge request KartKrew/Kart!2248
This commit is contained in:
Sal 2024-04-10 00:56:31 +00:00
commit 5dd38a4e88
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_podium.cpp
View file

@ -720,7 +720,8 @@ void podiumData_s::Draw(void)
.xy(32, 1) .xy(32, 1)
.align(srb2::Draw::Align::kCenter) .align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing) .font(srb2::Draw::Font::kPing)
.text(va( .text(lvl->time == UINT32_MAX ?
"--'--\"--" : va(
"%i'%02i\"%02i", "%i'%02i\"%02i",
G_TicsToMinutes(lvl->time, true), G_TicsToMinutes(lvl->time, true),
G_TicsToSeconds(lvl->time), G_TicsToSeconds(lvl->time),

8
src/k_tally.cpp
View file

@ -552,10 +552,14 @@ void level_tally_t::Init(player_t *player)
done = (player->spectator == true || player->bot == true); done = (player->spectator == true || player->bot == true);
if (specialstageinfo.valid == true && (player->pflags & PF_NOCONTEST) == PF_NOCONTEST && if (specialstageinfo.valid == true && (player->pflags & PF_NOCONTEST) == PF_NOCONTEST &&
(G_GametypeUsesLives() && player->lives <= 0) == false) // TODO: this leveltime check works, but checking
// leveltime is kind of fragile in case order of
// operations ever changes. There should be a better
// way to tell if the player spawned GAME OVERed.
(G_GametypeUsesLives() && player->lives <= 0 && leveltime == 0) == false)
{ {
// No tally when losing special stages // No tally when losing special stages
// Except when GAME OVER // Except when entering from GAME OVER.
state = TALLY_ST_IGNORE; state = TALLY_ST_IGNORE;
delay = 0; delay = 0;
} }

2
src/st_stuff.c
View file

@ -1490,7 +1490,7 @@ void ST_DrawSaveReplayHint(INT32 flags)
V_DrawRightAlignedThinString( V_DrawRightAlignedThinString(
BASEVIDWIDTH - 2, 2, BASEVIDWIDTH - 2, 2,
flags|V_YELLOWMAP, flags|V_YELLOWMAP,
demo.willsave ? "Replay will be saved. \xAB Change title" : "\xAB or \xAE Save replay" demo.willsave ? "Replay will be saved. \xAB Change title" : "\xAB or \xAD Save replay"
); );
} }