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

extras-1.c - convert magic numbers for Extras menu listings to enums

Browse source 
Makes this code much less fragile to changing entries.
This commit is contained in:
toaster 2023-03-26 21:54:33 +01:00
parent 8f592c196f
commit 6e48a671ee
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_menu.h
View file

@ -1011,6 +1011,16 @@ extern struct extrasmenu_s {
} extrasmenu; } extrasmenu;
typedef enum
{
extras_addons = 0,
extras_challenges,
extras_tutorial,
extras_statistics,
extras_eggtv,
extras_stereo,
} extras_e;
void M_InitExtras(INT32 choice); // init for the struct void M_InitExtras(INT32 choice); // init for the struct
void M_ExtrasTick(void); void M_ExtrasTick(void);
boolean M_ExtrasInputs(INT32 ch); boolean M_ExtrasInputs(INT32 ch);

48
src/menus/extras-1.c
View file

@ -37,7 +37,7 @@ menu_t EXTRAS_MainDef = {
0, 0, 0, 0,
0, 0,
"EXTRAS", "EXTRAS",
2, 5, 28, 5,
M_DrawExtras, M_DrawExtras,
M_ExtrasTick, M_ExtrasTick,
NULL, NULL,
@ -52,8 +52,6 @@ struct extrasmenu_s extrasmenu;
void M_InitExtras(INT32 choice) void M_InitExtras(INT32 choice)
{ {
UINT32 maxvalid = 2;
(void)choice; (void)choice;
extrasmenu.ticker = 0; extrasmenu.ticker = 0;
@ -67,54 +65,44 @@ void M_InitExtras(INT32 choice)
// Addons // Addons
if (M_SecretUnlocked(SECRET_ADDONS, true)) if (M_SecretUnlocked(SECRET_ADDONS, true))
{ {
EXTRAS_Main[0].status = IT_STRING | IT_CALL; EXTRAS_Main[extras_addons].status = IT_STRING | IT_CALL;
EXTRAS_Main[0].text = "Addons"; EXTRAS_Main[extras_addons].text = "Addons";
EXTRAS_Main[0].tooltip = "Add files to customize your experience."; EXTRAS_Main[extras_addons].tooltip = "Add files to customize your experience.";
} }
else else
{ {
EXTRAS_Main[0].status = IT_STRING | IT_TRANSTEXT; EXTRAS_Main[extras_addons].status = IT_STRING | IT_TRANSTEXT;
EXTRAS_Main[0].text = EXTRAS_Main[0].tooltip = "???"; EXTRAS_Main[extras_addons].text = EXTRAS_Main[extras_addons].tooltip = "???";
if (EXTRAS_MainDef.lastOn == 0) if (EXTRAS_MainDef.lastOn == extras_addons)
{ {
EXTRAS_MainDef.lastOn = 1; EXTRAS_MainDef.lastOn = extras_challenges;
} }
} }
// Egg TV // Egg TV
if (M_SecretUnlocked(SECRET_EGGTV, true)) if (M_SecretUnlocked(SECRET_EGGTV, true))
{ {
EXTRAS_Main[3].status = IT_STRING | IT_CALL; EXTRAS_Main[extras_eggtv].status = IT_STRING | IT_CALL;
EXTRAS_Main[3].text = "Egg TV"; EXTRAS_Main[extras_eggtv].text = "Egg TV";
EXTRAS_Main[3].tooltip = "Watch the replays you've saved throughout your many races & battles!"; EXTRAS_Main[extras_eggtv].tooltip = "Watch the replays you've saved throughout your many races & battles!";
maxvalid = 3;
} }
else else
{ {
EXTRAS_Main[3].status = IT_STRING | IT_TRANSTEXT; EXTRAS_Main[extras_eggtv].status = IT_STRING | IT_TRANSTEXT;
EXTRAS_Main[3].text = EXTRAS_Main[3].tooltip = "???"; EXTRAS_Main[extras_eggtv].text = EXTRAS_Main[extras_eggtv].tooltip = "???";
if (EXTRAS_MainDef.lastOn == 3)
{
EXTRAS_MainDef.lastOn = maxvalid;
}
} }
// Stereo Mode // Stereo Mode
if (M_SecretUnlocked(SECRET_SOUNDTEST, true)) if (M_SecretUnlocked(SECRET_SOUNDTEST, true))
{ {
EXTRAS_Main[4].status = IT_STRING | IT_CALL; EXTRAS_Main[extras_stereo].status = IT_STRING | IT_CALL;
EXTRAS_Main[4].text = "Stereo Mode"; EXTRAS_Main[extras_stereo].text = "Stereo Mode";
EXTRAS_Main[4].tooltip = "You can listen to your favourite tunes here!"; EXTRAS_Main[extras_stereo].tooltip = "You can listen to your favourite tunes here!";
maxvalid = 4;
} }
else else
{ {
EXTRAS_Main[4].status = IT_STRING | IT_TRANSTEXT; EXTRAS_Main[extras_stereo].status = IT_STRING | IT_TRANSTEXT;
EXTRAS_Main[4].text = EXTRAS_Main[4].tooltip = "???"; EXTRAS_Main[extras_stereo].text = EXTRAS_Main[extras_stereo].tooltip = "???";
if (EXTRAS_MainDef.lastOn == 4)
{
EXTRAS_MainDef.lastOn = maxvalid;
}
} }
M_SetupNextMenu(&EXTRAS_MainDef, false); M_SetupNextMenu(&EXTRAS_MainDef, false);