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

Merge branch 'virtual-keyboard-fix' into 'master'

Browse source 
Only toggle keyboardTyping when input key is valid

See merge request KartKrew/Kart!1604
This commit is contained in:
Eidolon 2023-11-05 19:44:18 +00:00
commit ade0b7cf10
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/menus/transient/virtual-keyboard.c
View file

@ -237,7 +237,7 @@ void M_MenuTypingInput(INT32 key)
if (!menutyping.keyboardtyping) // controller inputs if (!menutyping.keyboardtyping) // controller inputs
{ {
// we pressed a keyboard input that's not any of our buttons // we pressed a keyboard input that's not any of our buttons
if (M_IsTypingKey(key) && menucmd[pid].dpad_lr == 0 && menucmd[pid].dpad_ud == 0 if (key >= 0 && M_IsTypingKey(key) && menucmd[pid].dpad_lr == 0 && menucmd[pid].dpad_ud == 0
&& !(menucmd[pid].buttons & MBT_A) && !(menucmd[pid].buttons & MBT_A)
&& !(menucmd[pid].buttons & MBT_B) && !(menucmd[pid].buttons & MBT_B)
&& !(menucmd[pid].buttons & MBT_C) && !(menucmd[pid].buttons & MBT_C)
@ -252,7 +252,7 @@ void M_MenuTypingInput(INT32 key)
else // Keyboard inputs. else // Keyboard inputs.
{ {
// On the flipside, if we're pressing any keyboard input, switch to controller inputs. // On the flipside, if we're pressing any keyboard input, switch to controller inputs.
if (!M_IsTypingKey(key) && ( if (key >= 0 && !M_IsTypingKey(key) && (
M_MenuButtonPressed(pid, MBT_A) M_MenuButtonPressed(pid, MBT_A)
|| M_MenuButtonPressed(pid, MBT_B) || M_MenuButtonPressed(pid, MBT_B)
|| M_MenuButtonPressed(pid, MBT_C) || M_MenuButtonPressed(pid, MBT_C)