summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-01 12:55:01 +0200
committerGitHub <noreply@github.com>2019-07-01 12:55:01 +0200
commit931b6dfd334e85de88cc9c033eab3234d1b43bec (patch)
treec01424836b4db91976b4b34b9a4cd4b1bafde850
parentd17eac735cc84abd9afd1e083df1a4e8a2c8e656 (diff)
parent310b03d97e2ecefdc72917edca640a44058a6cd1 (diff)
Merge pull request #30219 from Calinou/tweak-gamepad-button-names
Tweak gamepad button names to be consistent with the documentation
-rw-r--r--editor/project_settings_editor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index df0dd8781e..3caa10b4e2 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -42,10 +42,10 @@
ProjectSettingsEditor *ProjectSettingsEditor::singleton = NULL;
static const char *_button_names[JOY_BUTTON_MAX] = {
- "PS Cross, XBox A, Nintendo B",
- "PS Circle, XBox B, Nintendo A",
- "PS Square, XBox X, Nintendo Y",
- "PS Triangle, XBox Y, Nintendo X",
+ "DualShock Cross, Xbox A, Nintendo B",
+ "DualShock Circle, Xbox B, Nintendo A",
+ "DualShock Square, Xbox X, Nintendo Y",
+ "DualShock Triangle, Xbox Y, Nintendo X",
"L, L1",
"R, R1",
"L2",