diff options
author | 2016-04-12 17:19:58 +0200 | |
---|---|---|
committer | 2016-04-12 17:19:58 +0200 | |
commit | 0233dd4dbf31b4b022be1163043230b0ab37c8df (patch) | |
tree | dc9d488664dec6b9de3d9bfd2d5f5d0d6093bbb9 /src/emu/ui/ui.cpp | |
parent | fbc8dbf1934b8066f8004673e4d89f7108a574f5 (diff) |
Make core vector-related slider handling slightly less egregious, nw
Diffstat (limited to 'src/emu/ui/ui.cpp')
-rw-r--r-- | src/emu/ui/ui.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index 9e6a0579a3e..718e73bb9ef 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -2402,12 +2402,11 @@ static INT32 slider_overyoffset(running_machine &machine, void *arg, int id, std static INT32 slider_flicker(running_machine &machine, void *arg, int id, std::string *str, INT32 newval) { - vector_device *vector = nullptr; if (newval != SLIDER_NOCHANGE) - vector->set_flicker((float)newval * 0.001f); + vector_options::s_flicker = (float)newval * 0.001f; if (str) - *str = string_format(_("%1$1.2f"), vector->get_flicker()); - return floor(vector->get_flicker() * 1000.0f + 0.5f); + *str = string_format(_("%1$1.2f"), vector_options::s_flicker); + return floor(vector_options::s_flicker * 1000.0f + 0.5f); } @@ -2418,12 +2417,11 @@ static INT32 slider_flicker(running_machine &machine, void *arg, int id, std::st static INT32 slider_beam_width_min(running_machine &machine, void *arg, int id, std::string *str, INT32 newval) { - vector_device *vector = nullptr; if (newval != SLIDER_NOCHANGE) - vector->set_beam_width_min(MIN((float)newval * 0.01f, vector->get_beam_width_max())); + vector_options::s_beam_width_min = MIN((float)newval * 0.01f, vector_options::s_beam_width_max); if (str != nullptr) - *str = string_format(_("%1$1.2f"), vector->get_beam_width_min()); - return floor(vector->get_beam_width_min() * 100.0f + 0.5f); + *str = string_format(_("%1$1.2f"), vector_options::s_beam_width_min); + return floor(vector_options::s_beam_width_min * 100.0f + 0.5f); } @@ -2434,12 +2432,11 @@ static INT32 slider_beam_width_min(running_machine &machine, void *arg, int id, static INT32 slider_beam_width_max(running_machine &machine, void *arg, int id, std::string *str, INT32 newval) { - vector_device *vector = nullptr; if (newval != SLIDER_NOCHANGE) - vector->set_beam_width_max(MAX((float)newval * 0.01f, vector->get_beam_width_min())); + vector_options::s_beam_width_max = MAX((float)newval * 0.01f, vector_options::s_beam_width_min); if (str != nullptr) - *str = string_format(_("%1$1.2f"), vector->get_beam_width_max()); - return floor(vector->get_beam_width_max() * 100.0f + 0.5f); + *str = string_format(_("%1$1.2f"), vector_options::s_beam_width_max); + return floor(vector_options::s_beam_width_max * 100.0f + 0.5f); } @@ -2450,12 +2447,11 @@ static INT32 slider_beam_width_max(running_machine &machine, void *arg, int id, static INT32 slider_beam_intensity_weight(running_machine &machine, void *arg, int id, std::string *str, INT32 newval) { - vector_device *vector = nullptr; if (newval != SLIDER_NOCHANGE) - vector->set_beam_intensity_weight((float)newval * 0.001f); + vector_options::s_beam_intensity_weight = (float)newval * 0.001f; if (str != nullptr) - *str = string_format(_("%1$1.2f"), vector->get_beam_intensity_weight()); - return floor(vector->get_beam_intensity_weight() * 1000.0f + 0.5f); + *str = string_format(_("%1$1.2f"), vector_options::s_beam_intensity_weight); + return floor(vector_options::s_beam_intensity_weight * 1000.0f + 0.5f); } |