From cf2bdbb15e9191ab960440d358b799cce8a226ad Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Aug 2016 20:40:39 +0200 Subject: [PATCH] Remove wraparound.setting_enable --- configuration.c | 2 -- configuration.h | 1 - menu/menu_setting.c | 2 +- setting_list.c | 12 ++++++------ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configuration.c b/configuration.c index 9c6faced2b..beec4d4d16 100644 --- a/configuration.c +++ b/configuration.c @@ -1079,8 +1079,6 @@ static void config_set_defaults(void) settings->menu.title_color = menu_title_color; settings->menu.dpi.override_value = menu_dpi_override_value; - - settings->menu.navigation.wraparound.setting_enable = true; #endif #ifdef HAVE_CHEEVOS diff --git a/configuration.h b/configuration.h index 6200735856..ee13634533 100644 --- a/configuration.h +++ b/configuration.h @@ -188,7 +188,6 @@ typedef struct settings struct { bool enable; - bool setting_enable; } wraparound; struct { diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 23ff01603f..c6164b15dd 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -281,7 +281,7 @@ static int setting_string_action_right_driver(void *data, { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) { drv.label = setting->name; drv.s = setting->value.target.string; diff --git a/setting_list.c b/setting_list.c index 4d62904dab..0652008aa8 100644 --- a/setting_list.c +++ b/setting_list.c @@ -162,7 +162,7 @@ static int setting_int_action_right_default(void *data, bool wraparound) { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.integer = min; else *setting->value.target.integer = max; @@ -260,7 +260,7 @@ static int setting_uint_action_right_default(void *data, bool wraparound) { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.unsigned_integer = min; else *setting->value.target.unsigned_integer = max; @@ -340,7 +340,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.integer = min; else *setting->value.target.integer = max; @@ -358,7 +358,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.unsigned_integer = min; else *setting->value.target.unsigned_integer = max; @@ -376,7 +376,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.fraction = min; else *setting->value.target.fraction = max; @@ -450,7 +450,7 @@ static int setting_fraction_action_right_default( { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.setting_enable) + if (settings && settings->menu.navigation.wraparound.enable) *setting->value.target.fraction = min; else *setting->value.target.fraction = max;