From 18aec77c105fcdaca8729850a519d26a7d5cb624 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 3 Jun 2015 10:55:46 +0200 Subject: [PATCH] Cleanups --- menu/menu_setting.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 7522f8238c..02c9a934af 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -533,7 +533,6 @@ static int setting_action_start_analog_dpad_mode(void *data) return 0; } - static int setting_action_start_libretro_device_type(void *data) { unsigned current_device, i, devices[128], types = 0, port = 0; @@ -542,11 +541,9 @@ static int setting_action_start_libretro_device_type(void *data) settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - if (!setting) + if (setting_generic_action_start_default(setting) != 0) return -1; - setting_reset_setting(setting); - port = setting->index_offset; devices[types++] = RETRO_DEVICE_NONE; @@ -661,17 +658,16 @@ static int setting_action_toggle_analog_dpad_mode(void *data, switch (action) { - case MENU_ACTION_RIGHT: - settings->input.analog_dpad_mode[port] = - (settings->input.analog_dpad_mode[port] + 1) - % ANALOG_DPAD_LAST; - break; - case MENU_ACTION_LEFT: settings->input.analog_dpad_mode[port] = (settings->input.analog_dpad_mode [port] + ANALOG_DPAD_LAST - 1) % ANALOG_DPAD_LAST; break; + case MENU_ACTION_RIGHT: + settings->input.analog_dpad_mode[port] = + (settings->input.analog_dpad_mode[port] + 1) + % ANALOG_DPAD_LAST; + break; } return 0; @@ -746,7 +742,6 @@ static int setting_action_toggle_libretro_device_type( settings->input.libretro_device[port] = current_device; pretro_set_controller_port_device(port, current_device); break; - case MENU_ACTION_RIGHT: current_device = devices [(current_idx + 1) % types];