From 6fbceface064309429a3606d689dd36489926b7b Mon Sep 17 00:00:00 2001 From: Maksym H Date: Thu, 8 Jun 2023 10:54:45 +0300 Subject: [PATCH] Disable joysticks without SDL2 (cherry picked from commit 9b1209a68a4ae51f38dd2ebc97a7c168e9cacfc8) --- builtin/settingtypes.txt | 4 ++-- multicraft.conf.example | 4 ++-- src/defaultsettings.cpp | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 986decbd7..aac6519b7 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -143,7 +143,7 @@ fixed_virtual_joystick (Fixed virtual joystick) bool false virtual_joystick_triggers_aux (Virtual joystick triggers aux button) bool false # Enable joysticks -enable_joysticks (Enable joysticks) bool false +enable_joysticks (Enable joysticks) bool true # The identifier of the joystick to use joystick_id (Joystick ID) int 0 @@ -156,7 +156,7 @@ joystick_type (Joystick type) enum auto auto,generic,xbox repeat_joystick_button_time (Joystick button repetition interval) float 0.17 0.001 # The deadzone of the joystick -joystick_deadzone (Joystick deadzone) int 2048 +joystick_deadzone (Joystick deadzone) int 4096 # The sensitivity of the joystick axes for moving the # ingame view frustum around. diff --git a/multicraft.conf.example b/multicraft.conf.example index 1bf2c6c06..1507a58c3 100644 --- a/multicraft.conf.example +++ b/multicraft.conf.example @@ -118,7 +118,7 @@ # Enable joysticks # type: bool -# enable_joysticks = false +# enable_joysticks = true # The identifier of the joystick to use # type: int @@ -135,7 +135,7 @@ # The deadzone of the joystick # type: int -# joystick_deadzone = 2048 +# joystick_deadzone = 4096 # The sensitivity of the joystick axes for moving the # ingame view frustum around. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 5b4216fe8..af1d1725c 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -290,12 +290,16 @@ void set_default_settings() settings->setDefault("always_fly_fast", "true"); settings->setDefault("autojump", "false"); settings->setDefault("continuous_forward", "false"); +#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) settings->setDefault("enable_joysticks", "true"); +#else + settings->setDefault("enable_joysticks", "false"); +#endif settings->setDefault("joystick_id", "0"); settings->setDefault("joystick_type", ""); settings->setDefault("repeat_joystick_button_time", "0.17"); settings->setDefault("joystick_frustum_sensitivity", "170"); - settings->setDefault("joystick_deadzone", "2048"); + settings->setDefault("joystick_deadzone", "4096"); // Main menu settings->setDefault("main_menu_path", "");