diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-01 14:32:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 14:32:04 +0200 |
| commit | b0ce9401ffa731cc346ab6762fd0794709634428 (patch) | |
| tree | c2e6de01b9efec28c959dbfd5cd59a0973d432e7 /editor/project_settings_editor.cpp | |
| parent | 531c92a53e5e7b9a1cb55249ef6086e874239872 (diff) | |
| parent | 3c154eb93b3a098354bf6d18a9428826ec193f90 (diff) | |
| download | redot-engine-b0ce9401ffa731cc346ab6762fd0794709634428.tar.gz | |
Merge pull request #30126 from qarmin/remove_unnecessary_code
Remove unnecessary code and add some error explanations
Diffstat (limited to 'editor/project_settings_editor.cpp')
| -rw-r--r-- | editor/project_settings_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 3caa10b4e2..001846604c 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -257,7 +257,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_axis_value((device_index->get_selected() & 1) ? 1 : -1); jm->set_device(_get_current_device()); for (int i = 0; i < events.size(); i++) { @@ -483,7 +483,7 @@ void ProjectSettingsEditor::_add_item(int p_item, Ref<InputEvent> p_exiting_even for (int i = 0; i < JOY_AXIS_MAX * 2; i++) { String desc = _axis_names[i]; - device_index->add_item(TTR("Axis") + " " + itos(i / 2) + " " + (i & 1 ? "+" : "-") + desc); + device_index->add_item(TTR("Axis") + " " + itos(i / 2) + " " + ((i & 1) ? "+" : "-") + desc); } device_input->popup_centered_minsize(Size2(350, 95) * EDSCALE); |