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

Force menus to use default controls for now. Update device in realtime in control setup menu

Browse source
This commit is contained in:
SinnamonLat 2022-04-11 14:50:51 +02:00
parent 8b88284b32
commit 6db54f77d8
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_game.c
View file

@ -669,6 +669,11 @@ INT32 G_PlayerInputAnalog(UINT8 p, INT32 gc, UINT8 menuPlayers)
boolean tryingotherID = false; boolean tryingotherID = false;
INT32 *controltable = &(gamecontrol[p][gc][0]); INT32 *controltable = &(gamecontrol[p][gc][0]);
// Due to issues currently, force menus to use default controls regardless.
// @FIXME ?
if (gamestate == GS_MENU || menuactive == true)
controltable = &(gamecontroldefault[gc][0]);
if (p >= MAXSPLITSCREENPLAYERS) if (p >= MAXSPLITSCREENPLAYERS)
{ {
#ifdef PARANOIA #ifdef PARANOIA

2
src/k_menufunc.c
View file

@ -4040,6 +4040,8 @@ boolean M_ProfileControlsInputs(INT32 ch)
if (optionsmenu.bindcontrol) if (optionsmenu.bindcontrol)
return true; // Eat all inputs there. We'll use a stupid hack in M_Responder instead. return true; // Eat all inputs there. We'll use a stupid hack in M_Responder instead.
SetDeviceOnPress(); // Update device constantly so that we don't stay stuck with otpions saying a device is unavailable just because we're mapping multiple devices...
if (M_MenuButtonPressed(pid, MBT_C) || M_MenuButtonPressed(pid, MBT_Z)) if (M_MenuButtonPressed(pid, MBT_C) || M_MenuButtonPressed(pid, MBT_Z))
{ {
// check if we're on a valid menu option... // check if we're on a valid menu option...