Merge pull request #3442 from fr500/master

remove these two duplicated lines
This commit is contained in:
Alcaro 2016-08-27 18:19:13 +02:00 committed by GitHub
commit 43b6ce416e

View File

@ -87,12 +87,6 @@ bool input_remapping_load_file(void *data, const char *path)
snprintf(buf, sizeof(buf), "input_player%u_analog_dpad_mode", i + 1); snprintf(buf, sizeof(buf), "input_player%u_analog_dpad_mode", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.analog_dpad_mode[i], buf); CONFIG_GET_INT_BASE(conf, settings, input.analog_dpad_mode[i], buf);
snprintf(buf, sizeof(buf), "input_player%u_joypad_index", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.joypad_map[i], buf);
snprintf(buf, sizeof(buf), "input_player%u_analog_dpad_mode", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.analog_dpad_mode[i], buf);
if (!global->has_set.libretro_device[i]) if (!global->has_set.libretro_device[i])
{ {
snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1); snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1);