summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/ui.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/ui/ui.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/ui/ui.cpp')
-rw-r--r--src/emu/ui/ui.cpp146
1 files changed, 73 insertions, 73 deletions
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 0f59220ccc8..3a016b25b10 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -143,7 +143,7 @@ static INT32 slider_crossoffset(running_machine &machine, void *arg, std::string
// character a possible line break?
//-------------------------------------------------
-INLINE int is_breakable_char(unicode_char ch)
+static inline int is_breakable_char(unicode_char ch)
{
// regular spaces and hyphens are breakable
if (ch == ' ' || ch == '-')
@@ -231,8 +231,8 @@ ui_manager::ui_manager(running_machine &machine)
ui_gfx_init(machine);
// reset instance variables
- m_font = NULL;
- m_handler_callback = NULL;
+ m_font = nullptr;
+ m_handler_callback = nullptr;
m_handler_param = 0;
m_single_step = false;
m_showfps = false;
@@ -240,7 +240,7 @@ ui_manager::ui_manager(running_machine &machine)
m_show_profiler = false;
m_popup_text_end = 0;
m_use_natural_keyboard = false;
- m_mouse_arrow_texture = NULL;
+ m_mouse_arrow_texture = nullptr;
// more initialization
set_handler(handler_messagebox, 0);
@@ -268,13 +268,13 @@ void ui_manager::exit()
{
// free the mouse texture
machine().render().texture_free(m_mouse_arrow_texture);
- m_mouse_arrow_texture = NULL;
+ m_mouse_arrow_texture = nullptr;
// free the font
- if (m_font != NULL)
+ if (m_font != nullptr)
{
machine().render().font_free(m_font);
- m_font = NULL;
+ m_font = nullptr;
}
}
@@ -438,7 +438,7 @@ void ui_manager::update_and_render(render_container *container)
machine().cheat().render_text(*container);
// call the current UI handler
- assert(m_handler_callback != NULL);
+ assert(m_handler_callback != nullptr);
m_handler_param = (*m_handler_callback)(machine(), container, m_handler_param);
// display any popup messages
@@ -453,7 +453,7 @@ void ui_manager::update_and_render(render_container *container)
bool mouse_button;
render_target *mouse_target = ui_input_find_mouse(machine(), &mouse_target_x, &mouse_target_y, &mouse_button);
- if (mouse_target != NULL)
+ if (mouse_target != nullptr)
{
float mouse_y=-1,mouse_x=-1;
if (mouse_target->map_point_container(mouse_target_x, mouse_target_y, *container, mouse_x, mouse_y)) {
@@ -475,7 +475,7 @@ void ui_manager::update_and_render(render_container *container)
render_font *ui_manager::get_font()
{
// allocate the font and messagebox string
- if (m_font == NULL)
+ if (m_font == nullptr)
m_font = machine().render().font_alloc(machine().options().ui_font());
return m_font;
}
@@ -582,7 +582,7 @@ void ui_manager::draw_outlined_box(render_container *container, float x0, float
void ui_manager::draw_text(render_container *container, const char *buf, float x, float y)
{
- draw_text_full(container, buf, x, y, 1.0f - x, JUSTIFY_LEFT, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL);
+ draw_text_full(container, buf, x, y, 1.0f - x, JUSTIFY_LEFT, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
}
@@ -612,7 +612,7 @@ void ui_manager::draw_text_full(render_container *container, const char *origs,
// loop over lines
while (*s != 0)
{
- const char *lastbreak = NULL;
+ const char *lastbreak = nullptr;
int line_justify = justify;
unicode_char schar;
int scharcount;
@@ -679,7 +679,7 @@ void ui_manager::draw_text_full(render_container *container, const char *origs,
if (wrap == WRAP_WORD)
{
// if we hit a break, back up to there with the appropriate width
- if (lastbreak != NULL)
+ if (lastbreak != nullptr)
{
s = lastbreak;
curwidth = lastbreak_width;
@@ -844,7 +844,7 @@ void ui_manager::draw_text_box(render_container *container, const char *text, in
target_x + target_width + UI_BOX_LR_BORDER,
target_y + target_height + UI_BOX_TB_BORDER, backcolor);
draw_text_full(container, text, target_x, target_y, target_width + 0.00001f,
- justify, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL);
+ justify, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
}
@@ -1158,10 +1158,10 @@ std::string &ui_manager::game_info_astring(std::string &str)
// loop over all CPUs
execute_interface_iterator execiter(machine().root_device());
- tagmap_t<UINT8> exectags;
- for (device_execute_interface *exec = execiter.first(); exec != NULL; exec = execiter.next())
+ std::unordered_set<std::string> exectags;
+ for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next())
{
- if (exectags.add(exec->device().tag(), 1, FALSE) == TMERR_DUPLICATE)
+ if (!exectags.insert(exec->device().tag()).second)
continue;
// get cpu specific clock that takes internal multiplier/dividers into account
int clock = exec->device().clock();
@@ -1170,10 +1170,10 @@ std::string &ui_manager::game_info_astring(std::string &str)
int count = 1;
const char *name = exec->device().name();
execute_interface_iterator execinneriter(machine().root_device());
- for (device_execute_interface *scan = execinneriter.first(); scan != NULL; scan = execinneriter.next())
+ for (device_execute_interface *scan = execinneriter.first(); scan != nullptr; scan = execinneriter.next())
{
if (exec->device().type() == scan->device().type() && strcmp(name, scan->device().name()) == 0 && exec->device().clock() == scan->device().clock())
- if (exectags.add(scan->device().tag(), 1, FALSE) != TMERR_DUPLICATE)
+ if (exectags.insert(scan->device().tag()).second)
count++;
}
@@ -1191,11 +1191,11 @@ std::string &ui_manager::game_info_astring(std::string &str)
// loop over all sound chips
sound_interface_iterator snditer(machine().root_device());
- tagmap_t<UINT8> soundtags;
+ std::unordered_set<std::string> soundtags;
bool found_sound = false;
- for (device_sound_interface *sound = snditer.first(); sound != NULL; sound = snditer.next())
+ for (device_sound_interface *sound = snditer.first(); sound != nullptr; sound = snditer.next())
{
- if (soundtags.add(sound->device().tag(), 1, FALSE) == TMERR_DUPLICATE)
+ if (!soundtags.insert(sound->device().tag()).second)
continue;
// append the Sound: string
@@ -1206,10 +1206,10 @@ std::string &ui_manager::game_info_astring(std::string &str)
// count how many identical sound chips we have
int count = 1;
sound_interface_iterator sndinneriter(machine().root_device());
- for (device_sound_interface *scan = sndinneriter.first(); scan != NULL; scan = sndinneriter.next())
+ for (device_sound_interface *scan = sndinneriter.first(); scan != nullptr; scan = sndinneriter.next())
{
if (sound->device().type() == scan->device().type() && sound->device().clock() == scan->device().clock())
- if (soundtags.add(scan->device().tag(), 1, FALSE) != TMERR_DUPLICATE)
+ if (soundtags.insert(scan->device().tag()).second)
count++;
}
// if more than one, prepend a #x in front of the CPU name
@@ -1235,7 +1235,7 @@ std::string &ui_manager::game_info_astring(std::string &str)
str.append("None\n");
else
{
- for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next())
+ for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
{
if (scrcount > 1)
{
@@ -1430,11 +1430,11 @@ bool ui_manager::can_paste()
char *text = osd_get_clipboard_text();
// free the string if allocated
- if (text != NULL)
+ if (text != nullptr)
osd_free(text);
// did we have text?
- return text != NULL;
+ return text != nullptr;
}
@@ -1448,7 +1448,7 @@ void ui_manager::paste()
char *text = osd_get_clipboard_text();
// was a result returned?
- if (text != NULL)
+ if (text != nullptr)
{
// post the text
machine().ioport().natkeyboard().post_utf8(text);
@@ -1470,7 +1470,7 @@ void ui_manager::image_handler_ingame()
if (machine().phase() == MACHINE_PHASE_RUNNING)
{
image_interface_iterator iter(machine().root_device());
- for (device_image_interface *image = iter.first(); image != NULL; image = iter.next())
+ for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
image->call_display();
}
}
@@ -1490,14 +1490,14 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co
{
std::string tempstring;
machine.ui().draw_text_full(container, machine.video().speed_text(tempstring).c_str(), 0.0f, 0.0f, 1.0f,
- JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, NULL, NULL);
+ JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr);
}
// draw the profiler if visible
if (machine.ui().show_profiler())
{
const char *text = g_profiler.text(machine);
- machine.ui().draw_text_full(container, text, 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, NULL, NULL);
+ machine.ui().draw_text_full(container, text, 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr);
}
// if we're single-stepping, pause now
@@ -1590,7 +1590,7 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co
if (ui_input_pressed(machine, IPT_UI_TAPE_START))
{
cassette_device_iterator cassiter(machine.root_device());
- for (cassette_image_device *cass = cassiter.first(); cass != NULL; cass = cassiter.next())
+ for (cassette_image_device *cass = cassiter.first(); cass != nullptr; cass = cassiter.next())
{
cass->change_state(CASSETTE_PLAY, CASSETTE_MASK_UISTATE);
return 0;
@@ -1599,7 +1599,7 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co
if (ui_input_pressed(machine, IPT_UI_TAPE_STOP))
{
cassette_device_iterator cassiter(machine.root_device());
- for (cassette_image_device *cass = cassiter.first(); cass != NULL; cass = cassiter.next())
+ for (cassette_image_device *cass = cassiter.first(); cass != nullptr; cass = cassiter.next())
{
cass->change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE);
return 0;
@@ -1845,13 +1845,13 @@ static slider_state *slider_init(running_machine &machine)
{
ioport_field *field;
ioport_port *port;
- slider_state *listhead = NULL;
+ slider_state *listhead = nullptr;
slider_state **tailptr = &listhead;
std::string str;
int item;
// add overall volume
- *tailptr = slider_alloc(machine, "Master Volume", -32, 0, 0, 1, slider_volume, NULL);
+ *tailptr = slider_alloc(machine, "Master Volume", -32, 0, 0, 1, slider_volume, nullptr);
tailptr = &(*tailptr)->next;
// add per-channel volume
@@ -1868,8 +1868,8 @@ static slider_state *slider_init(running_machine &machine)
}
// add analog adjusters
- for (port = machine.ioport().first_port(); port != NULL; port = port->next())
- for (field = port->first_field(); field != NULL; field = field->next())
+ for (port = machine.ioport().first_port(); port != nullptr; port = port->next())
+ for (field = port->first_field(); field != nullptr; field = field->next())
if (field->type() == IPT_ADJUSTER)
{
void *param = (void *)field;
@@ -1881,7 +1881,7 @@ static slider_state *slider_init(running_machine &machine)
if (machine.options().cheat())
{
execute_interface_iterator iter(machine.root_device());
- for (device_execute_interface *exec = iter.first(); exec != NULL; exec = iter.next())
+ for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
{
void *param = (void *)&exec->device();
strprintf(str, "Overclock CPU %s", exec->device().tag());
@@ -1892,7 +1892,7 @@ static slider_state *slider_init(running_machine &machine)
// add screen parameters
screen_device_iterator scriter(machine.root_device());
- for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next())
+ for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
{
int defxscale = floor(screen->xscale() * 1000.0f + 0.5f);
int defyscale = floor(screen->yscale() * 1000.0f + 0.5f);
@@ -1935,7 +1935,7 @@ static slider_state *slider_init(running_machine &machine)
}
laserdisc_device_iterator lditer(machine.root_device());
- for (laserdisc_device *laserdisc = lditer.first(); laserdisc != NULL; laserdisc = lditer.next())
+ for (laserdisc_device *laserdisc = lditer.first(); laserdisc != nullptr; laserdisc = lditer.next())
if (laserdisc->overlay_configured())
{
laserdisc_overlay_config config;
@@ -1961,25 +1961,25 @@ static slider_state *slider_init(running_machine &machine)
tailptr = &(*tailptr)->next;
}
- for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next())
+ for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
if (screen->screen_type() == SCREEN_TYPE_VECTOR)
{
// add vector control
- *tailptr = slider_alloc(machine, "Vector Flicker", 0, 0, 1000, 10, slider_flicker, NULL);
+ *tailptr = slider_alloc(machine, "Vector Flicker", 0, 0, 1000, 10, slider_flicker, nullptr);
tailptr = &(*tailptr)->next;
- *tailptr = slider_alloc(machine, "Beam Width Minimum", 1, 100, 1000, 1, slider_beam_width_min, NULL);
+ *tailptr = slider_alloc(machine, "Beam Width Minimum", 1, 100, 1000, 1, slider_beam_width_min, nullptr);
tailptr = &(*tailptr)->next;
- *tailptr = slider_alloc(machine, "Beam Width Maximum", 1, 100, 1000, 1, slider_beam_width_max, NULL);
+ *tailptr = slider_alloc(machine, "Beam Width Maximum", 1, 100, 1000, 1, slider_beam_width_max, nullptr);
tailptr = &(*tailptr)->next;
- *tailptr = slider_alloc(machine, "Beam Intensity Weight", -1000, 0, 1000, 10, slider_beam_intensity_weight, NULL);
+ *tailptr = slider_alloc(machine, "Beam Intensity Weight", -1000, 0, 1000, 10, slider_beam_intensity_weight, nullptr);
tailptr = &(*tailptr)->next;
break;
}
#ifdef MAME_DEBUG
// add crosshair adjusters
- for (port = machine.ioport().first_port(); port != NULL; port = port->next())
- for (field = port->first_field(); field != NULL; field = field->next())
+ for (port = machine.ioport().first_port(); port != nullptr; port = port->next())
+ for (field = port->first_field(); field != nullptr; field = field->next())
if (field->crosshair_axis() != CROSSHAIR_AXIS_NONE && field->player() == 0)
{
void *param = (void *)field;
@@ -2004,7 +2004,7 @@ static INT32 slider_volume(running_machine &machine, void *arg, std::string *str
{
if (newval != SLIDER_NOCHANGE)
machine.sound().set_attenuation(newval);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%3ddB", machine.sound().attenuation());
return machine.sound().attenuation();
}
@@ -2026,7 +2026,7 @@ static INT32 slider_mixervol(running_machine &machine, void *arg, std::string *s
if (newval > curval && (newval - curval) <= 4) newval += 4; // round up on increment
info.stream->set_user_gain(info.inputnum, (float)newval * 0.001f);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%4.2f", (double) info.stream->user_gain(info.inputnum));
return floorf(info.stream->user_gain(info.inputnum) * 1000.0f + 0.5f);
}
@@ -2048,7 +2048,7 @@ static INT32 slider_adjuster(running_machine &machine, void *arg, std::string *s
settings.value = newval;
field->set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%d%%", settings.value);
return settings.value;
}
@@ -2064,7 +2064,7 @@ static INT32 slider_overclock(running_machine &machine, void *arg, std::string *
device_t *cpu = (device_t *)arg;
if (newval != SLIDER_NOCHANGE)
cpu->set_clock_scale((float)newval * 0.001f);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%3.0f%%", floor(cpu->clock_scale() * 100.0 + 0.5));
return floor(cpu->clock_scale() * 1000.0 + 0.5);
}
@@ -2087,7 +2087,7 @@ static INT32 slider_refresh(running_machine &machine, void *arg, std::string *st
const rectangle &visarea = screen->visible_area();
screen->configure(width, height, visarea, HZ_TO_ATTOSECONDS(defrefresh + (double)newval * 0.001));
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3ffps", ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds()));
refresh = ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds());
return floor((refresh - defrefresh) * 1000.0 + 0.5);
@@ -2110,7 +2110,7 @@ static INT32 slider_brightness(running_machine &machine, void *arg, std::string
settings.m_brightness = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_brightness);
return floor(settings.m_brightness * 1000.0f + 0.5f);
}
@@ -2132,7 +2132,7 @@ static INT32 slider_contrast(running_machine &machine, void *arg, std::string *s
settings.m_contrast = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_contrast);
return floor(settings.m_contrast * 1000.0f + 0.5f);
}
@@ -2153,7 +2153,7 @@ static INT32 slider_gamma(running_machine &machine, void *arg, std::string *str,
settings.m_gamma = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_gamma);
return floor(settings.m_gamma * 1000.0f + 0.5f);
}
@@ -2175,7 +2175,7 @@ static INT32 slider_xscale(running_machine &machine, void *arg, std::string *str
settings.m_xscale = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_xscale);
return floor(settings.m_xscale * 1000.0f + 0.5f);
}
@@ -2197,7 +2197,7 @@ static INT32 slider_yscale(running_machine &machine, void *arg, std::string *str
settings.m_yscale = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_yscale);
return floor(settings.m_yscale * 1000.0f + 0.5f);
}
@@ -2219,7 +2219,7 @@ static INT32 slider_xoffset(running_machine &machine, void *arg, std::string *st
settings.m_xoffset = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_xoffset);
return floor(settings.m_xoffset * 1000.0f + 0.5f);
}
@@ -2241,7 +2241,7 @@ static INT32 slider_yoffset(running_machine &machine, void *arg, std::string *st
settings.m_yoffset = (float)newval * 0.001f;
screen->container().set_user_settings(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_yoffset);
return floor(settings.m_yoffset * 1000.0f + 0.5f);
}
@@ -2263,7 +2263,7 @@ static INT32 slider_overxscale(running_machine &machine, void *arg, std::string
settings.m_overscalex = (float)newval * 0.001f;
laserdisc->set_overlay_config(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_overscalex);
return floor(settings.m_overscalex * 1000.0f + 0.5f);
}
@@ -2285,7 +2285,7 @@ static INT32 slider_overyscale(running_machine &machine, void *arg, std::string
settings.m_overscaley = (float)newval * 0.001f;
laserdisc->set_overlay_config(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_overscaley);
return floor(settings.m_overscaley * 1000.0f + 0.5f);
}
@@ -2307,7 +2307,7 @@ static INT32 slider_overxoffset(running_machine &machine, void *arg, std::string
settings.m_overposx = (float)newval * 0.001f;
laserdisc->set_overlay_config(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_overposx);
return floor(settings.m_overposx * 1000.0f + 0.5f);
}
@@ -2329,7 +2329,7 @@ static INT32 slider_overyoffset(running_machine &machine, void *arg, std::string
settings.m_overposy = (float)newval * 0.001f;
laserdisc->set_overlay_config(settings);
}
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%.3f", (double) settings.m_overposy);
return floor(settings.m_overposy * 1000.0f + 0.5f);
}
@@ -2342,10 +2342,10 @@ static INT32 slider_overyoffset(running_machine &machine, void *arg, std::string
static INT32 slider_flicker(running_machine &machine, void *arg, std::string *str, INT32 newval)
{
- vector_device *vector = NULL;
+ vector_device *vector = nullptr;
if (newval != SLIDER_NOCHANGE)
vector->set_flicker((float)newval * 0.001f);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%1.2f", (double) vector->get_flicker());
return floor(vector->get_flicker() * 1000.0f + 0.5f);
}
@@ -2358,10 +2358,10 @@ static INT32 slider_flicker(running_machine &machine, void *arg, std::string *st
static INT32 slider_beam_width_min(running_machine &machine, void *arg, std::string *str, INT32 newval)
{
- vector_device *vector = NULL;
+ vector_device *vector = nullptr;
if (newval != SLIDER_NOCHANGE)
vector->set_beam_width_min(MIN((float)newval * 0.01f, vector->get_beam_width_max()));
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%1.2f", (double) vector->get_beam_width_min());
return floor(vector->get_beam_width_min() * 100.0f + 0.5f);
}
@@ -2374,10 +2374,10 @@ static INT32 slider_beam_width_min(running_machine &machine, void *arg, std::str
static INT32 slider_beam_width_max(running_machine &machine, void *arg, std::string *str, INT32 newval)
{
- vector_device *vector = NULL;
+ vector_device *vector = nullptr;
if (newval != SLIDER_NOCHANGE)
vector->set_beam_width_max(MAX((float)newval * 0.01f, vector->get_beam_width_min()));
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%1.2f", (double) vector->get_beam_width_max());
return floor(vector->get_beam_width_max() * 100.0f + 0.5f);
}
@@ -2390,10 +2390,10 @@ static INT32 slider_beam_width_max(running_machine &machine, void *arg, std::str
static INT32 slider_beam_intensity_weight(running_machine &machine, void *arg, std::string *str, INT32 newval)
{
- vector_device *vector = NULL;
+ vector_device *vector = nullptr;
if (newval != SLIDER_NOCHANGE)
vector->set_beam_intensity_weight((float)newval * 0.001f);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%1.2f", (double) vector->get_beam_intensity_weight());
return floor(vector->get_beam_intensity_weight() * 1000.0f + 0.5f);
}
@@ -2430,7 +2430,7 @@ static INT32 slider_crossscale(running_machine &machine, void *arg, std::string
if (newval != SLIDER_NOCHANGE)
field->set_crosshair_scale(float(newval) * 0.001);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%s %s %1.3f", "Crosshair Scale", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
return floor(field->crosshair_scale() * 1000.0f + 0.5f);
}
@@ -2449,7 +2449,7 @@ static INT32 slider_crossoffset(running_machine &machine, void *arg, std::string
if (newval != SLIDER_NOCHANGE)
field->set_crosshair_offset(float(newval) * 0.001f);
- if (str != NULL)
+ if (str != nullptr)
strprintf(*str,"%s %s %1.3f", "Crosshair Offset", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
return field->crosshair_offset();
}