incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blankart-dev' into AirDrop

Browse source
This commit is contained in:
NepDisk 2025-09-22 17:05:58 -04:00
commit 9dc0bdc31e
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/m_menu.c
View file

@ -5710,18 +5710,12 @@ INT32 MR_StartGrandPrix(INT32 choice)
// Drawing function for Time Attack // Drawing function for Time Attack
void MD_DrawTimeAttackMenu(void) void MD_DrawTimeAttackMenu(void)
{ {
INT32 i, x, y;
SINT8 preset = G_RecordPresetIndex(); SINT8 preset = G_RecordPresetIndex();
// draw menu (everything else goes on top of it)
// Sadly we can't just use generic mode menus because we need some extra hacks
x = currentMenu->x;
y = currentMenu->y;
// Character face! // Character face!
{ {
UINT8 *colormap = R_GetTranslationColormap(cv_chooseskin.value, cv_playercolor[0].value, GTC_MENUCACHE); UINT8 *colormap = R_GetTranslationColormap(cv_chooseskin.value, cv_playercolor[0].value, GTC_MENUCACHE);
V_DrawMappedPatch(BASEVIDWIDTH-x - SHORT(faceprefix[cv_chooseskin.value][FACE_WANTED]->width), y, 0, faceprefix[cv_chooseskin.value][FACE_WANTED], colormap); V_DrawMappedPatch(BASEVIDWIDTH - menudefs[MN_SP_TIMEATTACK].x - SHORT(faceprefix[cv_chooseskin.value][FACE_WANTED]->width), menudefs[MN_SP_TIMEATTACK].y, 0, faceprefix[cv_chooseskin.value][FACE_WANTED], colormap);
} }
MD_DrawGenericMenu(); MD_DrawGenericMenu();
@ -5777,10 +5771,10 @@ void MD_DrawTimeAttackMenu(void)
return; return;
menu_t *menu = &menudefs[MN_SP_TIMEATTACK]; menu_t *menu = &menudefs[MN_SP_TIMEATTACK];
for (i = 0; i < menu->numitems; i++) for (INT32 i = 0; i < menu->numitems; i++)
{ {
x = menu->x + menu->menuitems[i].x; INT32 x = menu->x + menu->menuitems[i].x;
y = menu->y + M_GetItemAbsY(menu, i); INT32 y = menu->y + M_GetItemAbsY(menu, i);
if (y < 128) if (y < 128)
M_DrawMenuItem(&menu->menuitems[i], x, y, V_TRANSLUCENT|MENUCAPS, false); M_DrawMenuItem(&menu->menuitems[i], x, y, V_TRANSLUCENT|MENUCAPS, false);
} }