mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use float values now that setting min/max are float instead of double

Browse Source
This commit is contained in:
LibretroAdmin 2022-10-03 01:53:58 +02:00
parent 4672c5a5c0
commit 13cc6b7f46
2 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
menu/menu_displaylist.c
View File

@ -14227,8 +14227,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
int32_t orig_value = *setting->value.target.integer;
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_INT_ITEM;
float step = setting->step;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 99999.00;
float min = setting->enforce_minrange ? setting->min : 0.00f;
float max = setting->enforce_maxrange ? setting->max : 99999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;
@ -14304,8 +14304,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM;
float step = setting->step;
float half_step = step * 0.5f;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 9999.00;
float min = setting->enforce_minrange ?
setting->min : 0.00f;
float max = setting->enforce_maxrange ?
setting->max : 9999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;
@ -14378,8 +14380,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
unsigned orig_value = *setting->value.target.unsigned_integer;
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM;
float step = setting->step;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 9999.00;
float min = setting->enforce_minrange ?
setting->min : 0.00f;
float max = setting->enforce_maxrange ?
setting->max : 9999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;
@ -14560,8 +14564,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
int32_t orig_value = *setting->value.target.integer;
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL;
float step = setting->step;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 9999.00;
float min = setting->enforce_minrange ?
setting->min : 0.00f;
float max = setting->enforce_maxrange ?
setting->max : 9999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;
@ -14636,8 +14642,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL;
float step = setting->step;
float half_step = step * 0.5f;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 9999.00;
float min = setting->enforce_minrange ?
setting->min : 0.00f;
float max = setting->enforce_maxrange ?
setting->max : 9999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;
@ -14709,8 +14717,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
unsigned orig_value = *setting->value.target.unsigned_integer;
unsigned setting_type = MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL;
float step = setting->step;
double min = setting->enforce_minrange ? setting->min : 0.00;
double max = setting->enforce_maxrange ? setting->max : 9999.00;
float min = setting->enforce_minrange ?
setting->min : 0.00f;
float max = setting->enforce_maxrange ?
setting->max : 9999.00f;
bool checked_found = false;
unsigned checked = 0;
unsigned entry_index = 0;

34
menu/menu_setting.c
View File

@ -619,7 +619,7 @@ static int setting_bind_action_ok(
static int setting_int_action_right_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{
double max = 0.0f;
float max = 0.0f;
if (!setting)
return -1;
@ -636,7 +636,7 @@ static int setting_int_action_right_default(
if (*setting->value.target.integer > max)
{
settings_t *settings = config_get_ptr();
double min = setting->min;
float min = setting->min;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.integer = min;
@ -784,7 +784,7 @@ int setting_uint_action_left_default(
if (setting->enforce_minrange)
{
double min = setting->min;
float min = setting->min;
if (overflowed || *setting->value.target.unsigned_integer < min)
{
settings_t *settings = config_get_ptr();
@ -792,7 +792,7 @@ int setting_uint_action_left_default(
if (settings &&
settings->bools.menu_navigation_wraparound_enable)
{
double max = setting->max;
float max = setting->max;
*setting->value.target.unsigned_integer = max;
}
else
@ -819,11 +819,11 @@ int setting_uint_action_right_default(
if (setting->enforce_maxrange)
{
double max = setting->max;
float max = setting->max;
if (*setting->value.target.unsigned_integer > max)
{
settings_t *settings = config_get_ptr();
double min = setting->min;
float min = setting->min;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.unsigned_integer = min;
@ -905,11 +905,11 @@ static int setting_size_action_left_default(
if (setting->enforce_minrange)
{
double min = setting->min;
float min = setting->min;
if (overflowed || *setting->value.target.sizet < min)
{
settings_t *settings = config_get_ptr();
double max = setting->max;
float max = setting->max;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.sizet = max;
@ -936,11 +936,11 @@ static int setting_size_action_right_default(
if (setting->enforce_maxrange)
{
double max = setting->max;
float max = setting->max;
if (*setting->value.target.sizet > max)
{
settings_t *settings = config_get_ptr();
double min = setting->min;
float min = setting->min;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.sizet = min;
@ -1013,7 +1013,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
const char* value)
{
char *ptr;
double min, max;
float min, max;
uint64_t flags;
if (!setting || !value)
return -1;
@ -1124,11 +1124,11 @@ static int setting_fraction_action_left_default(
if (setting->enforce_minrange)
{
double min = setting->min;
float min = setting->min;
if (*setting->value.target.fraction < min)
{
settings_t *settings = config_get_ptr();
double max = setting->max;
float max = setting->max;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.fraction = max;
@ -1151,11 +1151,11 @@ static int setting_fraction_action_right_default(
if (setting->enforce_maxrange)
{
double max = setting->max;
float max = setting->max;
if (*setting->value.target.fraction > max)
{
settings_t *settings = config_get_ptr();
double min = setting->min;
float min = setting->min;
if (settings && settings->bools.menu_navigation_wraparound_enable)
*setting->value.target.fraction = min;
@ -1864,11 +1864,11 @@ static int setting_int_action_left_default(
if (setting->enforce_minrange)
{
double min = setting->min;
float min = setting->min;
if (*setting->value.target.integer < min)
{
settings_t *settings = config_get_ptr();
double max = setting->max;
float max = setting->max;
if ( settings
&& settings->bools.menu_navigation_wraparound_enable)