Merge pull request #8068 from Hinsbart/fix_ps_cross_2.1

InputMap: Rename joypad button "PS X" to "PS Cross". [2.1]
This commit is contained in:
Rémi Verschelde 2017-03-18 14:52:59 +01:00 committed by GitHub
commit 618ac3842e

View file

@ -38,7 +38,7 @@
ProjectSettings *ProjectSettings::singleton=NULL; ProjectSettings *ProjectSettings::singleton=NULL;
static const char* _button_names[JOY_BUTTON_MAX]={ static const char* _button_names[JOY_BUTTON_MAX]={
"PS X, XBox A, Nintendo B", "PS Cross, XBox A, Nintendo B",
"PS Circle, XBox B, Nintendo A", "PS Circle, XBox B, Nintendo A",
"PS Square, XBox X, Nintendo Y", "PS Square, XBox X, Nintendo Y",
"PS Triangle, XBox Y, Nintendo X", "PS Triangle, XBox Y, Nintendo X",