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

Fix unwinding Join By IP option

Browse source 
- M_CharacterSelectTick: Initialise Online menu when setting up
- PLAY_MP_OptSelect: Hide entries 0 and 1 instead of removing them, to keep options aligned
This commit is contained in:
toaster 2023-02-17 13:56:29 +00:00
parent f4d98a14b6
commit 7d015ac7b1
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/menus/play-char-select.c
View file

@ -1461,7 +1461,7 @@ void M_CharacterSelectTick(void)
} }
#if defined (TESTERS) #if defined (TESTERS)
M_SetupNextMenu(&PLAY_MP_OptSelectDef, false); M_MPOptSelectInit(0);
#else #else
M_SetupNextMenu(&PLAY_MainDef, false); M_SetupNextMenu(&PLAY_MainDef, false);
#endif #endif

32
src/menus/play-online-1.c
View file

@ -3,27 +3,25 @@
#include "../k_menu.h" #include "../k_menu.h"
#if defined (TESTERS) #if defined (TESTERS)
menuitem_t PLAY_MP_OptSelect[] = #define IT_STRING_CALL_NOTESTERS IT_DISABLED
{
{IT_STRING | IT_CALL, "Join by IP", "Join an online game by its IP address.",
NULL, {.routine = M_MPJoinIPInit}, 0, 0},
};
#else #else
menuitem_t PLAY_MP_OptSelect[] = #define IT_STRING_CALL_NOTESTERS (IT_STRING | IT_CALL)
{ #endif // TESTERS
//{IT_NOTHING | IT_KEYHANDLER, NULL, NULL, NULL, M_MPOptSelect, 0, 0},
{IT_STRING | IT_CALL, "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.", menuitem_t PLAY_MP_OptSelect[] =
NULL, {.routine = M_MPRoomSelectInit}, 0, 0}, {
{IT_STRING_CALL_NOTESTERS, "Host Game", "Start your own online game!",
NULL, {.routine = M_MPHostInit}, 0, 0},
{IT_STRING | IT_CALL, "Join by IP", "Join an online game by its IP address.", {IT_STRING_CALL_NOTESTERS, "Server Browser", "Search for game servers to play in.",
NULL, {.routine = M_MPJoinIPInit}, 0, 0}, NULL, {.routine = M_MPRoomSelectInit}, 0, 0},
};
#endif {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 = { menu_t PLAY_MP_OptSelectDef = {