diff options
| author | Rémi Verschelde | 2018-04-19 21:06:17 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-19 21:06:17 +0200 |
| commit | 8ae042a895a3527079a8b4fb6ef4e1a78a45a358 (patch) | |
| tree | c111e06bc4b50e30ec5da5a9ec3109d168b053c1 /editor/project_settings_editor.cpp | |
| parent | fab28cc0f3f7ac7fa6cf05e260f7571300943b83 (diff) | |
| parent | 7e89dc432c8781114f4855d6d2f24675a5a1ce5f (diff) | |
| download | godot-8ae042a895a3527079a8b4fb6ef4e1a78a45a358.tar.gz godot-8ae042a895a3527079a8b4fb6ef4e1a78a45a358.tar.zst godot-8ae042a895a3527079a8b4fb6ef4e1a78a45a358.zip | |
Merge pull request #18280 from groud/fix_input
Fixes left/up axis not mappable as actions
Diffstat (limited to 'editor/project_settings_editor.cpp')
| -rw-r--r-- | editor/project_settings_editor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 8ae573bae..3127644a8 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -234,6 +234,7 @@ void ProjectSettingsEditor::_device_input_add() { Ref<InputEventJoypadMotion> jm; jm.instance(); jm->set_axis(device_index->get_selected() >> 1); + jm->set_axis_value(device_index->get_selected() & 1 ? 1 : -1); jm->set_device(_get_current_device()); bool should_update_event = true; @@ -243,7 +244,7 @@ void ProjectSettingsEditor::_device_input_add() { Ref<InputEventJoypadMotion> aie = events[i]; if (aie.is_null()) continue; - if (aie->get_device() == jm->get_device() && aie->get_axis() == jm->get_axis()) { + if (aie->get_device() == jm->get_device() && aie->get_axis() == jm->get_axis() && aie->get_axis_value() == jm->get_axis_value()) { should_update_event = false; break; } |