thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Roughest layout from cup grid

Browse source
This commit is contained in:
toaster 2022-12-02 21:42:17 +00:00
parent 5e76896ac4
commit 9de675165f
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menudef.c
View file

@ -1756,7 +1756,7 @@ menu_t MISC_ChallengesDef = {
&MainDef, &MainDef,
0, 0,
MISC_ChallengesMenu, MISC_ChallengesMenu,
48, 80, 14, 32,
0, 0, 0, 0,
98, 0, 98, 0,
M_DrawChallenges, M_DrawChallenges,

49
src/k_menudraw.c
View file

@ -4463,8 +4463,10 @@ void M_DrawAddons(void)
void M_DrawChallenges(void) void M_DrawChallenges(void)
{ {
INT32 x = 20, y = 20; INT32 x = currentMenu->x, y = currentMenu->y;
UINT8 i, j, id, num, work; UINT8 i, j, id, num, work;
const char *str;
INT16 offset;
unlockable_t *ref = NULL; unlockable_t *ref = NULL;
{ {
@ -4472,30 +4474,10 @@ void M_DrawChallenges(void)
V_DrawFixedPatch(0, 0, FRACUNIT, 0, bg, NULL); V_DrawFixedPatch(0, 0, FRACUNIT, 0, bg, NULL);
} }
if (challengesmenu.currentunlock < MAXUNLOCKABLES)
{
const char *str = unlockables[challengesmenu.currentunlock].name;
if (!gamedata->unlocked[challengesmenu.currentunlock])
{
str = "???"; //M_CreateSecretMenuOption(str);
}
V_DrawThinString(x, y, V_ALLOWLOWERCASE, str);
}
else
{
V_DrawThinString(x, y, V_ALLOWLOWERCASE, "---");
}
if (challengesmenu.unlockanim >= UNLOCKTIME)
V_DrawThinString(x, y + 10, V_ALLOWLOWERCASE, va("Press (%c)", challengesmenu.pending ? 'A' : 'B'));
x = currentMenu->x;
y = currentMenu->y;
if (!gamedata->challengegrid) if (!gamedata->challengegrid)
{ {
V_DrawString(x, y, V_REDMAP, "No challenges available!?"); V_DrawString(x, y, V_REDMAP, "No challenges available!?");
return; goto challengedesc;
} }
for (i = 0; i < gamedata->challengegridwidth; i++) for (i = 0; i < gamedata->challengegridwidth; i++)
@ -4575,4 +4557,27 @@ drawborder:
} }
M_DrawCharSelectExplosions(false, currentMenu->x, currentMenu->y); M_DrawCharSelectExplosions(false, currentMenu->x, currentMenu->y);
challengedesc:
y = 120;
V_DrawScaledPatch(0, y, 0, W_CachePatchName("MENUHINT", PU_CACHE));
if (challengesmenu.currentunlock < MAXUNLOCKABLES)
{
str = unlockables[challengesmenu.currentunlock].name;
if (!gamedata->unlocked[challengesmenu.currentunlock])
{
str = "???"; //M_CreateSecretMenuOption(str);
}
}
else
{
str = "---";
}
offset = V_LSTitleLowStringWidth(str, 0) / 2;
V_DrawLSTitleLowString(BASEVIDWIDTH/2 - offset, y+6, 0, str);
if (challengesmenu.unlockanim >= UNLOCKTIME)
V_DrawThinString(20, 120 + 60, V_ALLOWLOWERCASE, va("Press (%c)", challengesmenu.pending ? 'A' : 'B'));
} }