thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 02:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stereospecial_e

Browse source 
No more magic numbers for M_DrawSoundTest
This commit is contained in:
toaster 2023-03-29 23:23:51 +01:00
parent 2446e53ff9
commit f9975d6a71
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_menu.h
View file

@ -1219,6 +1219,15 @@ void M_Statistics(INT32 choice);
void M_DrawStatistics(void); void M_DrawStatistics(void);
boolean M_StatisticsInputs(INT32 ch); boolean M_StatisticsInputs(INT32 ch);
typedef enum
{
stereospecial_none = 0,
stereospecial_back,
stereospecial_pause,
stereospecial_play,
stereospecial_track,
} stereospecial_e;
void M_SoundTest(INT32 choice); void M_SoundTest(INT32 choice);
void M_DrawSoundTest(void); void M_DrawSoundTest(void);

8
src/k_menudraw.c
View file

@ -6001,7 +6001,7 @@ void M_DrawSoundTest(void)
); );
// Special cases // Special cases
if (currentMenu->menuitems[i].mvar2 == 1) // back if (currentMenu->menuitems[i].mvar2 == stereospecial_back) // back
{ {
if (!soundtest.justopened && M_MenuBackHeld(pid)) if (!soundtest.justopened && M_MenuBackHeld(pid))
{ {
@ -6009,12 +6009,12 @@ void M_DrawSoundTest(void)
} }
} }
// The following are springlocks. // The following are springlocks.
else if (currentMenu->menuitems[i].mvar2 == 2) // pause else if (currentMenu->menuitems[i].mvar2 == stereospecial_pause) // pause
{ {
if (soundtest.paused == true) if (soundtest.paused == true)
y = currentMenu->y + 6; y = currentMenu->y + 6;
} }
else if (currentMenu->menuitems[i].mvar2 == 3) // play else if (currentMenu->menuitems[i].mvar2 == stereospecial_play) // play
{ {
if (soundtest.playing == true && soundtest.paused == false) if (soundtest.playing == true && soundtest.paused == false)
y = currentMenu->y + 6; y = currentMenu->y + 6;
@ -6043,7 +6043,7 @@ void M_DrawSoundTest(void)
V_DrawFill(x+2, currentMenu->y + 22, 23, 1, 30); V_DrawFill(x+2, currentMenu->y + 22, 23, 1, 30);
} }
else if (currentMenu->menuitems[i].mvar2 == 4) // Track else if (currentMenu->menuitems[i].mvar2 == stereospecial_track) // Track
{ {
if (i == itemOn) if (i == itemOn)
{ {

8
src/menus/transient/sound-test.c
View file

@ -122,17 +122,17 @@ static boolean M_SoundTestInputs(INT32 ch)
menuitem_t MISC_SoundTest[] = menuitem_t MISC_SoundTest[] =
{ {
{IT_STRING | IT_CALL, "Back", "STER_IC0", NULL, {.routine = M_GoBack}, 0, 1}, {IT_STRING | IT_CALL, "Back", "STER_IC0", NULL, {.routine = M_GoBack}, 0, stereospecial_back},
{IT_SPACE, NULL, NULL, NULL, {NULL}, 11, 0}, {IT_SPACE, NULL, NULL, NULL, {NULL}, 11, 0},
{IT_STRING | IT_CALL, "Stop", "STER_IC1", NULL, {.routine = M_SoundTestMainControl}, 0, 0}, {IT_STRING | IT_CALL, "Stop", "STER_IC1", NULL, {.routine = M_SoundTestMainControl}, 0, 0},
{IT_SPACE, NULL, NULL, NULL, {NULL}, 8, 0}, {IT_SPACE, NULL, NULL, NULL, {NULL}, 8, 0},
{IT_STRING | IT_CALL, "Pause", "STER_IC2", NULL, {.routine = M_SoundTestMainControl}, 2, 2}, {IT_STRING | IT_CALL, "Pause", "STER_IC2", NULL, {.routine = M_SoundTestMainControl}, 2, stereospecial_pause},
{IT_STRING | IT_CALL, "Play", "STER_IC3", NULL, {.routine = M_SoundTestMainControl}, 1, 3}, {IT_STRING | IT_CALL, "Play", "STER_IC3", NULL, {.routine = M_SoundTestMainControl}, 1, stereospecial_play},
{IT_SPACE, NULL, NULL, NULL, {NULL}, 8, 0}, {IT_SPACE, NULL, NULL, NULL, {NULL}, 8, 0},
{IT_STRING | IT_CALL, "Prev", "STER_IC4", NULL, {.routine = M_SoundTestNextPrev}, -1, 0}, {IT_STRING | IT_CALL, "Prev", "STER_IC4", NULL, {.routine = M_SoundTestNextPrev}, -1, 0},
{IT_STRING | IT_CALL, "Next", "STER_IC5", NULL, {.routine = M_SoundTestNextPrev}, 1, 0}, {IT_STRING | IT_CALL, "Next", "STER_IC5", NULL, {.routine = M_SoundTestNextPrev}, 1, 0},
{IT_SPACE, NULL, NULL, NULL, {NULL}, 0, 276}, {IT_SPACE, NULL, NULL, NULL, {NULL}, 0, 276},
{IT_STRING | IT_ARROWS, "Track", NULL, NULL, {.routine = M_SoundTestTrack}, 0, 4}, {IT_STRING | IT_ARROWS, "Track", NULL, NULL, {.routine = M_SoundTestTrack}, 0, stereospecial_track},
}; };
menu_t MISC_SoundTestDef = { menu_t MISC_SoundTestDef = {