80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix a typo in CH Flightstick Pro's internal name

Browse Source
This commit is contained in:
Alexander Babikov
2021-12-29 09:49:38 +05:00
parent 81bc032b00
commit 00640bdc44
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@@ -917,7 +917,7 @@ load_input_devices(void)
p = config_get_string(cat, "joystick_type", NULL); p = config_get_string(cat, "joystick_type", NULL);
if (p != NULL) { if (p != NULL) {
if (!strcmp(p, "standard_2button")) if (!strcmp(p, "standard_2button")) /* migrate renamed types */
joystick_type = joystick_get_from_internal_name("2axis_2button"); joystick_type = joystick_get_from_internal_name("2axis_2button");
else if (!strcmp(p, "standard_4button")) else if (!strcmp(p, "standard_4button"))
joystick_type = joystick_get_from_internal_name("2axis_4button"); joystick_type = joystick_get_from_internal_name("2axis_4button");
@@ -925,6 +925,8 @@ load_input_devices(void)
joystick_type = joystick_get_from_internal_name("2axis_6button"); joystick_type = joystick_get_from_internal_name("2axis_6button");
else if (!strcmp(p, "standard_8button")) else if (!strcmp(p, "standard_8button"))
joystick_type = joystick_get_from_internal_name("2axis_8button"); joystick_type = joystick_get_from_internal_name("2axis_8button");
else if (!strcmp(p, "ch_flighstick_pro"))
joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
joystick_type = joystick_get_from_internal_name(p); joystick_type = joystick_get_from_internal_name(p);
if (!joystick_type) { if (!joystick_type) {

2
src/game/gameport.c
View File

@@ -88,7 +88,7 @@ static const struct {
{ "3axis_2button", &joystick_3axis_2button }, { "3axis_2button", &joystick_3axis_2button },
{ "3axis_4button", &joystick_3axis_4button }, { "3axis_4button", &joystick_3axis_4button },
{ "4axis_4button", &joystick_4axis_4button }, { "4axis_4button", &joystick_4axis_4button },
{ "ch_flighstick_pro", &joystick_ch_flightstick_pro }, { "ch_flightstick_pro", &joystick_ch_flightstick_pro },
{ "sidewinder_pad", &joystick_sw_pad }, { "sidewinder_pad", &joystick_sw_pad },
{ "thrustmaster_fcs", &joystick_tm_fcs }, { "thrustmaster_fcs", &joystick_tm_fcs },
{ "", NULL } { "", NULL }