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 'split-emblem-hints' into 'next'

Browse source 
"Symmetrical"-ish Emblem Hint pages

See merge request STJr/SRB2!670
This commit is contained in:
James R 2020-01-12 17:16:03 -05:00
commit 97ca460531
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/m_menu.c
View file

@ -7233,7 +7233,7 @@ static void M_EmblemHints(INT32 choice)
static void M_DrawEmblemHints(void) static void M_DrawEmblemHints(void)
{ {
INT32 i, j = 0, x, y; INT32 i, j = 0, x, y, left_hints = NUMHINTS;
UINT32 collected = 0, local = 0; UINT32 collected = 0, local = 0;
emblem_t *emblem; emblem_t *emblem;
const char *hint; const char *hint;
@ -7250,6 +7250,11 @@ static void M_DrawEmblemHints(void)
x = (local > NUMHINTS ? 4 : 12); x = (local > NUMHINTS ? 4 : 12);
y = 8; y = 8;
// If there are more than 1 page's but less than 2 pages' worth of emblems,
// put half (rounded up) of the hints on the left, and half (rounded down) on the right
if (local > NUMHINTS && local < (NUMHINTS*2)-1)
left_hints = (local + 1) / 2;
if (!local) if (!local)
V_DrawCenteredString(160, 48, V_YELLOWMAP, "No hidden emblems on this map."); V_DrawCenteredString(160, 48, V_YELLOWMAP, "No hidden emblems on this map.");
else for (i = 0; i < numemblems; i++) else for (i = 0; i < numemblems; i++)
@ -7282,7 +7287,7 @@ static void M_DrawEmblemHints(void)
y += 28; y += 28;
if (++j == NUMHINTS) if (++j == left_hints)
{ {
x = 4+(BASEVIDWIDTH/2); x = 4+(BASEVIDWIDTH/2);
y = 8; y = 8;