stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'room-list-first' into 'master'

Browse source 
Show room list instead of server list if you haven't selected a room yet

See merge request KartKrew/Kart-Public!127
This commit is contained in:
wolfs 2019-04-26 06:39:31 -04:00
commit f2ec722b12
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/m_menu.c
View file

@ -7456,7 +7456,10 @@ static void M_ConnectMenu(INT32 choice)
// first page of servers // first page of servers
serverlistpage = 0; serverlistpage = 0;
M_SetupNextMenu(&MP_ConnectDef); if (ms_RoomId < 0)
M_RoomMenu(0); // Select a room instead of staring at an empty list
else
M_SetupNextMenu(&MP_ConnectDef);
itemOn = 0; itemOn = 0;
M_Refresh(0); M_Refresh(0);
} }
@ -7529,7 +7532,15 @@ static void M_ChooseRoom(INT32 choice)
} }
serverlistpage = 0; serverlistpage = 0;
M_SetupNextMenu(currentMenu->prevMenu); /*
We were on the Multiplayer menu? That means that we must have been trying to
view the server browser, but we hadn't selected a room yet. So we need to go
to the browser next, not back there.
*/
if (currentMenu->prevMenu == &MP_MainDef)
M_SetupNextMenu(&MP_ConnectDef);
else
M_SetupNextMenu(currentMenu->prevMenu);
if (currentMenu == &MP_ConnectDef) if (currentMenu == &MP_ConnectDef)
M_Refresh(0); M_Refresh(0);
} }