thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PLAY_MP_OptSelectDef: Integrate M_MPOptSelectInit into M_SpecificMenuRestore

Browse source
This commit is contained in:
toaster 2023-01-31 15:52:46 +00:00
parent 7b483f9c75
commit 39dadf1b1e
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_menufunc.c
View file

@ -410,6 +410,11 @@ menu_t *M_SpecificMenuRestore(menu_t *torestore)
torestore = &EXTRAS_MainDef;
}
}
else if (torestore == &PLAY_MP_OptSelectDef)
{
// Ticker init
M_MPOptSelectInit(-1);
}
if (setup_numplayers == 0)
{

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

@ -47,23 +47,21 @@ boolean M_MPResetOpts(void)
void M_MPOptSelectInit(INT32 choice)
{
INT16 arrcpy[3][3] = {{0,68,0}, {0,12,0}, {0,74,0}};
UINT8 i = 0, j = 0; // To copy the array into the struct
const UINT32 forbidden = GTR_FORBIDMP;
(void)choice;
mpmenu.modechoice = 0;
mpmenu.ticker = 0;
for (; i < 3; i++)
for (j = 0; j < 3; j++)
mpmenu.modewinextend[i][j] = arrcpy[i][j]; // I miss Lua already
memcpy(&mpmenu.modewinextend, &arrcpy, sizeof(mpmenu.modewinextend));
// Guarantee menugametype is good
M_NextMenuGametype(forbidden);
M_PrevMenuGametype(forbidden);
M_SetupNextMenu(&PLAY_MP_OptSelectDef, false);
if (choice != -1)
{
M_SetupNextMenu(&PLAY_MP_OptSelectDef, false);
}
}
void M_MPOptSelectTick(void)