diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-28 21:14:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-28 21:14:16 +0100 |
| commit | 4e199a4a07c00f541bd9ae7235bcf02e703fa2b7 (patch) | |
| tree | 78726d063de0920b9aa971a13ec5443ed0f02018 | |
| parent | 0c7e7e2c2880565ef3b2d7455e89aee9373b7b8f (diff) | |
| parent | 54d53e0a78d6da2e6a2c9b74a144ba6f823b80ca (diff) | |
Merge pull request #3500 from Hinsbart/dpad-inputmap
fix dpad left/right not showing correctly in project settings
| -rw-r--r-- | tools/editor/project_settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index 6c5e18ec9a..cbac870a6b 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -474,7 +474,7 @@ void ProjectSettings::_update_actions() { case InputEvent::JOYSTICK_BUTTON: { String str = "Device "+itos(ie.device)+", Button "+itos(ie.joy_button.button_index); - if (ie.joy_button.button_index>=0 && ie.joy_button.button_index<14) + if (ie.joy_button.button_index>=0 && ie.joy_button.button_index<JOY_BUTTON_MAX) str+=String()+" ("+_button_names[ie.joy_button.button_index]+")."; else str+="."; |