From f4f52ede322b37f008b17d0620ed652fef0fbeec Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 7 May 2023 23:02:14 +0100 Subject: [PATCH] New consistent between-round countdowns using SmallNums - Intermission - Unlike before, shows in all contexts, not just netgame/netreplay - Voting - Replaces currently extant counter --- src/k_vote.c | 12 ++++++++---- src/y_inter.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/k_vote.c b/src/k_vote.c index 96c4c590f..3fb2c1375 100644 --- a/src/k_vote.c +++ b/src/k_vote.c @@ -846,10 +846,14 @@ void Y_VoteDrawer(void) { const INT32 tickDown = (vote.timer + 1) / TICRATE; - V_DrawCenteredString( - BASEVIDWIDTH/2, 188, - V_YELLOWMAP, - va("Vote ends in %d", tickDown) + // See also y_inter.c + V__DrawOneScaleString( + 2*FRACUNIT, + (BASEVIDHEIGHT - (2+8))*FRACUNIT, + FRACUNIT, + 0, NULL, + OPPRF_FONT, + va("%d", tickDown) ); } diff --git a/src/y_inter.c b/src/y_inter.c index cdd3a1513..620e0088d 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1118,6 +1118,20 @@ skiptallydrawer: } */ } + + { + const INT32 tickDown = (timer + 1)/TICRATE; + + // See also k_vote.c + V__DrawOneScaleString( + 2*FRACUNIT, + (BASEVIDHEIGHT - (2+8))*FRACUNIT, + FRACUNIT, + 0, NULL, + OPPRF_FONT, + va("%d", tickDown) + ); + } } //