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

Fix joystick type migration not working as intended

Browse Source 
Map legacy integer-based joystick type options directly
This commit is contained in:
Alexander Babikov
2021-12-29 09:51:42 +05:00
parent 00640bdc44
commit 29595ce4f7
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/config.c
View File

@@ -927,21 +927,41 @@ load_input_devices(void)
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")) else if (!strcmp(p, "ch_flighstick_pro"))
joystick_type = joystick_get_from_internal_name("ch_flightstick_pro"); joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
else
joystick_type = joystick_get_from_internal_name(p);
joystick_type = joystick_get_from_internal_name(p);
if (!joystick_type) { if (!joystick_type) {
/* Try to read an integer for backwards compatibility with old configs */ /* Try to read an integer for backwards compatibility with old configs */
c = config_get_int(cat, "joystick_type", 8); if (!strcmp(p, "0")) /* workaround for config_get_int returning 0 on non-integer data */
switch (c) { joystick_type = joystick_get_from_internal_name("2axis_2button");
case 0: case 1: case 2: case 3: /* 2-axis joysticks */ else {
joystick_type = c + 1; c = config_get_int(cat, "joystick_type", 8);
break; switch (c) {
case 4: case 5: case 6: case 7: /* other joysticks */ case 1:
joystick_type = c + 3; joystick_type = joystick_get_from_internal_name("2axis_4button");
break; break;
default: /* "None" (8) or invalid value */ case 2:
joystick_type = 0; joystick_type = joystick_get_from_internal_name("2axis_6button");
break; break;
case 3:
joystick_type = joystick_get_from_internal_name("2axis_8button");
break;
case 4:
joystick_type = joystick_get_from_internal_name("4axis_4button");
break;
case 5:
joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
break;
case 6:
joystick_type = joystick_get_from_internal_name("sidewinder_pad");
break;
case 7:
joystick_type = joystick_get_from_internal_name("thrustmaster_fcs");
break;
default:
joystick_type = 0;
break;
}
} }
} }
} else } else