mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-18 20:52:26 +00:00
Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again.
Also, sounds.
This commit is contained in:
parent
79639c1104
commit
7a4b6b6081
1 changed files with 16 additions and 16 deletions
32
src/m_menu.c
32
src/m_menu.c
|
|
@ -2795,6 +2795,7 @@ boolean M_Responder(event_t *ev)
|
|||
{
|
||||
// detach any keys associated with the game control
|
||||
G_ClearControlKeys(setupcontrols, currentMenu->menuitems[itemOn].alphaKey);
|
||||
S_StartSound(NULL, sfx_shldls);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -8673,23 +8674,22 @@ static void M_ChangecontrolResponse(event_t *ev)
|
|||
setupcontrols[control][found] = ch-KEY_4JOY1+KEY_DBL4JOY1;
|
||||
}
|
||||
else
|
||||
{
|
||||
// check if change key1 or key2, or replace the two by the new
|
||||
found = 0;
|
||||
if (setupcontrols[control][0] == KEY_NULL)
|
||||
found++;
|
||||
if (setupcontrols[control][1] == KEY_NULL)
|
||||
found++;
|
||||
if (found == 2)
|
||||
{
|
||||
found = 0;
|
||||
setupcontrols[control][1] = KEY_NULL; //replace key 1,clear key2
|
||||
}
|
||||
G_CheckDoubleUsage(ch);
|
||||
setupcontrols[control][found] = ch;
|
||||
}
|
||||
|
||||
{
|
||||
// check if change key1 or key2, or shuffle them along in a queue
|
||||
found = 0;
|
||||
if (setupcontrols[control][0] != KEY_NULL)
|
||||
{
|
||||
found++;
|
||||
if (setupcontrols[control][1] != KEY_NULL)
|
||||
setupcontrols[control][0] = setupcontrols[control][1];
|
||||
}
|
||||
G_CheckDoubleUsage(ch);
|
||||
setupcontrols[control][found] = ch;
|
||||
}
|
||||
S_StartSound(NULL, sfx_strpst);
|
||||
}
|
||||
else
|
||||
S_StartSound(NULL, sfx_skid);
|
||||
|
||||
M_StopMessage(0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue