mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'tester-menus' into 'master'
Don't let testers shoot themselves in menus See merge request KartKrew/Kart!934
This commit is contained in:
commit
a884e332ba
3 changed files with 26 additions and 5 deletions
|
|
@ -2179,6 +2179,10 @@ void F_TitleScreenTicker(boolean run)
|
|||
if (!cv_rollingdemos.value)
|
||||
return;
|
||||
|
||||
#if defined (TESTERS)
|
||||
return;
|
||||
#endif
|
||||
|
||||
// Wait for a while (for the music to finish, preferably)
|
||||
// before starting demos
|
||||
if (demoDelayLeft)
|
||||
|
|
|
|||
|
|
@ -1460,7 +1460,12 @@ void M_CharacterSelectTick(void)
|
|||
CV_StealthSetValue(&cv_usejoystick[0], setup_player[0].ponedevice);
|
||||
}
|
||||
|
||||
M_SetupNextMenu(&PLAY_MainDef, false);
|
||||
#if defined (TESTERS)
|
||||
M_MPOptSelectInit(0);
|
||||
#else
|
||||
M_SetupNextMenu(&PLAY_MainDef, false);
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
else // In a game
|
||||
|
|
|
|||
|
|
@ -3,22 +3,34 @@
|
|||
|
||||
#include "../k_menu.h"
|
||||
|
||||
#if defined (TESTERS)
|
||||
#define IT_STRING_CALL_NOTESTERS IT_DISABLED
|
||||
#else
|
||||
#define IT_STRING_CALL_NOTESTERS (IT_STRING | IT_CALL)
|
||||
#endif // TESTERS
|
||||
|
||||
menuitem_t PLAY_MP_OptSelect[] =
|
||||
{
|
||||
//{IT_NOTHING | IT_KEYHANDLER, NULL, NULL, NULL, M_MPOptSelect, 0, 0},
|
||||
{IT_STRING | IT_CALL, "Host Game", "Start your own online game!",
|
||||
{IT_STRING_CALL_NOTESTERS, "Host Game", "Start your own online game!",
|
||||
NULL, {.routine = M_MPHostInit}, 0, 0},
|
||||
|
||||
{IT_STRING | IT_CALL, "Server Browser", "Search for game servers to play in.",
|
||||
{IT_STRING_CALL_NOTESTERS, "Server Browser", "Search for game servers to play in.",
|
||||
NULL, {.routine = M_MPRoomSelectInit}, 0, 0},
|
||||
|
||||
{IT_STRING | IT_CALL, "Join by IP", "Join an online game by its IP address.",
|
||||
NULL, {.routine = M_MPJoinIPInit}, 0, 0},
|
||||
};
|
||||
|
||||
#undef IT_STRING_CALL_NOTESTERS
|
||||
|
||||
|
||||
menu_t PLAY_MP_OptSelectDef = {
|
||||
sizeof (PLAY_MP_OptSelect) / sizeof (menuitem_t),
|
||||
&PLAY_MainDef,
|
||||
#if defined (TESTERS)
|
||||
&PLAY_CharSelectDef,
|
||||
#else
|
||||
&PLAY_MainDef,
|
||||
#endif
|
||||
0,
|
||||
PLAY_MP_OptSelect,
|
||||
0, 0,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue