lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'nightsmode-menu-fix' into 'master'

Browse source 
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353)

Closes #353

See merge request STJr/SRB2Internal!539
This commit is contained in:
MascaraSnake 2019-11-25 13:20:31 -05:00
parent e48f4170fc d4a8fd8e64
commit 3a12c13e50
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/m_menu.c
View file

@ -9388,6 +9388,7 @@ void M_DrawNightsAttackMenu(void)
{ {
emblem_t *em; emblem_t *em;
INT32 yHeight; INT32 yHeight;
INT32 xpos;
patch_t *PictureOfLevel; patch_t *PictureOfLevel;
lumpnum_t lumpnum; lumpnum_t lumpnum;
char beststr[40]; char beststr[40];
@ -9447,17 +9448,23 @@ void M_DrawNightsAttackMenu(void)
{ {
switch (em->type) switch (em->type)
{ {
case ET_NGRADE: yHeight = 48; break; case ET_NGRADE:
case ET_NTIME: yHeight = 68; break; xpos = 104+38;
yHeight = 48;
break;
case ET_NTIME:
xpos = 104+76;
yHeight = 68;
break;
default: default:
goto skipThisOne; goto skipThisOne;
} }
if (em->collected) if (em->collected)
V_DrawSmallMappedPatch(104+38, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em, false), PU_CACHE), V_DrawSmallMappedPatch(xpos, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE)); R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE));
else else
V_DrawSmallScaledPatch(104+38, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDIT", PU_CACHE)); V_DrawSmallScaledPatch(xpos, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDIT", PU_CACHE));
skipThisOne: skipThisOne:
em = M_GetLevelEmblems(-1); em = M_GetLevelEmblems(-1);