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

Challenges menu QoL: <a> to set Driver and Follower

Browse source 
Also adjusts coordinates of other Challenges UI previews with control inputs to match
This commit is contained in:
toaster 2025-08-14 16:35:39 +01:00
parent 7b6b26fe30
commit 4fcdb3c5fe
2 changed files with 91 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/k_menudraw.c
View file

@ -7207,6 +7207,25 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
colormap = R_GetTranslationColormap(skin, skins[skin]->prefcolor, GTC_MENUCACHE); colormap = R_GetTranslationColormap(skin, skins[skin]->prefcolor, GTC_MENUCACHE);
M_DrawCharacterSprite(x, y, skin, SPR2_STIN, 7, 0, 0, colormap); M_DrawCharacterSprite(x, y, skin, SPR2_STIN, 7, 0, 0, colormap);
y = (BASEVIDHEIGHT-14);
if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST)
{
profile_t *pr = PR_GetProfile(cv_lastprofile[0].value);
if (pr)
{
K_DrawGameControl(
4, y, 0,
strcmp(pr->skinname, skins[skin]->name)
? "<a> <sky>Set on Profile"
: "<a_pressed> <gray>Set on Profile",
0, TINY_FONT, 0
);
y -= 14;
}
}
for (i = 0; i < skin; i++) for (i = 0; i < skin; i++)
{ {
if (!R_SkinUsable(-1, i, false)) if (!R_SkinUsable(-1, i, false))
@ -7220,7 +7239,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
break; break;
} }
M_DrawCharacterIconAndEngine(4, BASEVIDHEIGHT-(4+16), i, colormap, skin); M_DrawCharacterIconAndEngine(4, y-6, i, colormap, skin);
} }
break; break;
} }
@ -7242,9 +7261,28 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_MENUCACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_MENUCACHE);
M_DrawFollowerSprite(x - 16, y, fskin, false, 0, colormap, NULL); M_DrawFollowerSprite(x - 16, y, fskin, false, 0, colormap, NULL);
y = (BASEVIDHEIGHT-14);
if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST)
{
profile_t *pr = PR_GetProfile(cv_lastprofile[0].value);
if (pr)
{
K_DrawGameControl(
4, y, 0,
strcmp(pr->follower, followers[fskin].name)
? "<a> <sky>Set on Profile"
: "<a_pressed> <gray>Set on Profile",
0, TINY_FONT, 0
);
y -= 14;
}
}
if (followers[fskin].category < numfollowercategories) if (followers[fskin].category < numfollowercategories)
{ {
V_DrawFixedPatch(4*FRACUNIT, (BASEVIDHEIGHT-(4+16))*FRACUNIT, V_DrawFixedPatch(4*FRACUNIT, (y - 6)*FRACUNIT,
FRACUNIT, FRACUNIT,
0, W_CachePatchName(followercategories[followers[fskin].category].icon, PU_CACHE), 0, W_CachePatchName(followercategories[followers[fskin].category].icon, PU_CACHE),
NULL); NULL);
@ -7272,7 +7310,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
if (pr) if (pr)
{ {
K_DrawGameControl( K_DrawGameControl(
8, BASEVIDHEIGHT-16, 0, 4, (BASEVIDHEIGHT-14), 0,
(pr->color != colorid) (pr->color != colorid)
? "<a> <sky>Set on Profile" ? "<a> <sky>Set on Profile"
: "<a_pressed> <gray>Set on Profile", : "<a_pressed> <gray>Set on Profile",
@ -7363,7 +7401,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
const char *gtname = "Find your prize..."; const char *gtname = "Find your prize...";
UINT16 mapnum = M_UnlockableMapNum(ref); UINT16 mapnum = M_UnlockableMapNum(ref);
y = BASEVIDHEIGHT-(9+3); y = (BASEVIDHEIGHT-14);
if (mapnum >= nummapheaders if (mapnum >= nummapheaders
|| mapheaderinfo[mapnum] == NULL || mapheaderinfo[mapnum] == NULL
@ -7412,7 +7450,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
{ {
// Only for 1p // Only for 1p
K_DrawGameControl( K_DrawGameControl(
1, y, 0, 4, y, 0,
"<a_animated> <orange>Play Tutorial", "<a_animated> <orange>Play Tutorial",
0, TINY_FONT, 0 0, TINY_FONT, 0
); );
@ -7440,7 +7478,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
if (gtname) if (gtname)
{ {
V_DrawThinString(1, y, 0, gtname); V_DrawThinString(4, y, 0, gtname);
} }
break; break;
@ -7551,8 +7589,8 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
} }
case SECRET_ALTTITLE: case SECRET_ALTTITLE:
{ {
x = 8; x = 4;
y = BASEVIDHEIGHT-16; y = BASEVIDHEIGHT-14;
V_DrawGamemodeString(x, y - 33, 0, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PLAGUE, GTC_MENUCACHE), M_UseAlternateTitleScreen() ? "On" : "Off"); V_DrawGamemodeString(x, y - 33, 0, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PLAGUE, GTC_MENUCACHE), M_UseAlternateTitleScreen() ? "On" : "Off");
K_DrawGameControl(x, y, 0, "<a_animated> Toggle", 0, TINY_FONT, 0); K_DrawGameControl(x, y, 0, "<a_animated> Toggle", 0, TINY_FONT, 0);
@ -7605,8 +7643,8 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
V_DrawFixedPatch(x*FRACUNIT, (y+2)*FRACUNIT, FRACUNIT/2, addflags, patch, NULL); V_DrawFixedPatch(x*FRACUNIT, (y+2)*FRACUNIT, FRACUNIT/2, addflags, patch, NULL);
} }
x = 8; x = 4;
y = BASEVIDHEIGHT-16; y = (BASEVIDHEIGHT-14);
const boolean thismusplaying = Music_Playing("challenge_altmusic"); const boolean thismusplaying = Music_Playing("challenge_altmusic");
boolean pushed = false; boolean pushed = false;
@ -7629,8 +7667,7 @@ static void M_DrawChallengePreview(INT32 x, INT32 y)
0, TINY_FONT, 0 0, TINY_FONT, 0
); );
x = 8; y -= 14;
y -= 10;
} }
if (musicid < mapheaderinfo[map]->musname_size) if (musicid < mapheaderinfo[map]->musname_size)

42
src/menus/extras-challenges.c
View file

@ -1211,6 +1211,48 @@ boolean M_ChallengesInputs(INT32 ch)
} }
break; break;
} }
case SECRET_SKIN:
{
if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST && M_MenuConfirmPressed(pid))
{
INT32 skin = M_UnlockableSkinNum(ref);
if (skin != -1)
{
profile_t *pr = PR_GetProfile(cv_lastprofile[0].value);
if (pr && strcmp(pr->skinname, skins[skin]->name))
{
strcpy(pr->skinname, skins[skin]->name);
CV_Set(&cv_skin[0], skins[skin]->name);
S_StartSound(NULL, sfx_s3k63);
M_SetMenuDelay(pid);
}
}
}
break;
}
case SECRET_FOLLOWER:
{
if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST && M_MenuConfirmPressed(pid))
{
INT32 fskin = M_UnlockableFollowerNum(ref);
if (fskin != -1)
{
profile_t *pr = PR_GetProfile(cv_lastprofile[0].value);
if (pr && strcmp(pr->follower, followers[fskin].name))
{
strcpy(pr->follower, followers[fskin].name);
CV_Set(&cv_follower[0], followers[fskin].name);
S_StartSound(NULL, sfx_s3k63);
M_SetMenuDelay(pid);
}
}
}
break;
}
case SECRET_COLOR: case SECRET_COLOR:
{ {
if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST && M_MenuConfirmPressed(pid)) if (setup_numplayers <= 1 && cv_lastprofile[0].value != PROFILE_GUEST && M_MenuConfirmPressed(pid))