Merge pull request #14 from Jesright73/main

Only run oClient Step events if connection is established; Exit text edit mode with gamepad input
main
DodoBirby 3 years ago committed by GitHub
commit 3d46c15b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

File diff suppressed because it is too large Load Diff

@ -140,7 +140,7 @@ if active
key = keyboard_check_pressed(vk_return)
else
key = oControl.kMenu1 > 0
if ((key && oControl.kMenu1PushedSteps == 0) || (os_type != os_android && keyBegin && oControl.kMenu1PushedSteps == 0 && (!editing)))
if ((key || (os_type != os_android && ((keyBegin && (!editing)) || (editing && (joystick_check_button(global.opjoyid, global.opjoybtn_menu1) || gamepad_button_check(global.gamepadIndex, global.opxjoybtn_menu1)))))) && oControl.kMenu1PushedSteps == 0)
{
if (global.curropt == num_ip && os_type != os_android)
{

Loading…
Cancel
Save