From c378ea087097d75cd7f4fb69da062048eaaae5e6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 25 Nov 2021 01:55:53 +1100 Subject: A little more refactoring, and Coverity fixes: * emu/ioport.h: Marked PORT_RESET deprecated. * emu/rendlay.cpp: Removed old dot matrix components. * emu/rendlay.cpp: Added warning message for reel components. * Changed a few more fruit machines to eliminate reel components; also made the reel lamps simpler and more efficient in these layouts. * emu, frontend: Fixed various errors reported by Coverity, one of which actaully breaks stuff. --- src/emu/ioport.h | 2 + src/emu/rendersw.hxx | 61 +-- src/emu/rendlay.cpp | 58 +-- src/emu/rendlay.h | 1 - src/frontend/mame/cheat.cpp | 7 + src/frontend/mame/luaengine_debug.cpp | 2 +- src/frontend/mame/ui/custui.cpp | 44 +- src/frontend/mame/ui/custui.h | 10 +- src/frontend/mame/ui/filesel.h | 5 +- src/frontend/mame/ui/sndmenu.cpp | 18 +- src/frontend/mame/ui/sndmenu.h | 2 +- src/frontend/mame/ui/textbox.cpp | 1 + src/mame/layout/m1albsqp.lay | 494 +++++--------------- src/mame/layout/m1apollo2.lay | 494 +++++--------------- src/mame/layout/m1bargnc.lay | 494 +++++--------------- src/mame/layout/sc2casr2.lay | 758 +++++++----------------------- src/mame/layout/sc2prem2.lay | 853 +++++----------------------------- src/tools/srcclean.cpp | 2 +- 18 files changed, 695 insertions(+), 2611 deletions(-) diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 59f14b094d5..c767d44c250 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -914,6 +914,7 @@ public: { m_condition = condition; m_tag = tag; + m_port = nullptr; m_mask = mask; m_value = value; } @@ -1488,6 +1489,7 @@ public: ioport_configurer& field_set_toggle() { m_curfield->m_flags |= ioport_field::FIELD_FLAG_TOGGLE; return *this; } ioport_configurer& field_set_impulse(u8 impulse) { m_curfield->m_impulse = impulse; return *this; } ioport_configurer& field_set_analog_reverse() { m_curfield->m_flags |= ioport_field::ANALOG_FLAG_REVERSE; return *this; } + [[deprecated("PORT_RESET is deprecated; manage counter state explicitly")]] ioport_configurer& field_set_analog_reset() { m_curfield->m_flags |= ioport_field::ANALOG_FLAG_RESET; return *this; } ioport_configurer& field_set_optional() { m_curfield->m_flags |= ioport_field::FIELD_FLAG_OPTIONAL; return *this; } ioport_configurer& field_set_min_max(ioport_value minval, ioport_value maxval) { m_curfield->m_min = minval; m_curfield->m_max = maxval; return *this; } diff --git a/src/emu/rendersw.hxx b/src/emu/rendersw.hxx index 840f7fa5d8a..aca64c36ace 100644 --- a/src/emu/rendersw.hxx +++ b/src/emu/rendersw.hxx @@ -578,47 +578,33 @@ private: static void draw_rect(const render_primitive &prim, PixelType *dstdata, s32 width, s32 height, u32 pitch) { - render_bounds fpos = prim.bounds; + render_bounds const fpos = prim.bounds; assert(fpos.x0 <= fpos.x1); assert(fpos.y0 <= fpos.y1); - // clamp to integers - s32 startx = round_nearest(fpos.x0); - s32 starty = round_nearest(fpos.y0); - s32 endx = round_nearest(fpos.x1); - s32 endy = round_nearest(fpos.y1); - - // ensure we fit - if (startx < 0) startx = 0; - if (startx >= width) startx = width; - if (endx < 0) endx = 0; - if (endx >= width) endx = width; - if (starty < 0) starty = 0; - if (starty >= height) starty = height; - if (endy < 0) endy = 0; - if (endy >= height) endy = height; + // clamp to integers and ensure we fit + s32 const startx = std::clamp(round_nearest(fpos.x0), 0, width); + s32 const starty = std::clamp(round_nearest(fpos.y0), 0, width); + s32 const endx = std::clamp(round_nearest(fpos.x1), 0, height); + s32 const endy = std::clamp(round_nearest(fpos.y1), 0, height); // bail if nothing left - if (fpos.x0 > fpos.x1 || fpos.y0 > fpos.y1) + if ((startx > endx) || (starty > endy)) return; // only support alpha and "none" blendmodes assert(PRIMFLAG_GET_BLENDMODE(prim.flags) == BLENDMODE_NONE || PRIMFLAG_GET_BLENDMODE(prim.flags) == BLENDMODE_ALPHA); - // fast case: no alpha - if (PRIMFLAG_GET_BLENDMODE(prim.flags) == BLENDMODE_NONE || is_opaque(prim.color.a)) + if ((PRIMFLAG_GET_BLENDMODE(prim.flags) == BLENDMODE_NONE) || is_opaque(prim.color.a)) { - u32 r = u32(256.0f * prim.color.r); - u32 g = u32(256.0f * prim.color.g); - u32 b = u32(256.0f * prim.color.b); - u32 pix; + // fast case: no alpha // clamp R,G,B to 0-256 range - if (r > 0xff) { if (s32(r) < 0) r = 0; else r = 0xff; } - if (g > 0xff) { if (s32(g) < 0) g = 0; else g = 0xff; } - if (b > 0xff) { if (s32(b) < 0) b = 0; else b = 0xff; } - pix = dest_rgb_to_pixel(r, g, b); + u32 r = u32(std::clamp(256.0f * prim.color.r, 0.0f, 255.0f)); + u32 g = u32(std::clamp(256.0f * prim.color.g, 0.0f, 255.0f)); + u32 b = u32(std::clamp(256.0f * prim.color.b, 0.0f, 255.0f)); + u32 const pix = dest_rgb_to_pixel(r, g, b); // loop over rows for (s32 y = starty; y < endy; y++) @@ -630,23 +616,18 @@ private: *dest++ = pix; } } - - // alpha and/or coloring case else if (!is_transparent(prim.color.a)) { - u32 rmask = dest_rgb_to_pixel(0xff,0x00,0x00); - u32 gmask = dest_rgb_to_pixel(0x00,0xff,0x00); - u32 bmask = dest_rgb_to_pixel(0x00,0x00,0xff); - u32 r = u32(256.0f * prim.color.r * prim.color.a); - u32 g = u32(256.0f * prim.color.g * prim.color.a); - u32 b = u32(256.0f * prim.color.b * prim.color.a); - u32 inva = u32(256.0f * (1.0f - prim.color.a)); + // alpha and/or coloring case + u32 const rmask = dest_rgb_to_pixel(0xff,0x00,0x00); + u32 const gmask = dest_rgb_to_pixel(0x00,0xff,0x00); + u32 const bmask = dest_rgb_to_pixel(0x00,0x00,0xff); // clamp R,G,B and inverse A to 0-256 range - if (r > 0xff) { if (s32(r) < 0) r = 0; else r = 0xff; } - if (g > 0xff) { if (s32(g) < 0) g = 0; else g = 0xff; } - if (b > 0xff) { if (s32(b) < 0) b = 0; else b = 0xff; } - if (inva > 0x100) { if (s32(inva) < 0) inva = 0; else inva = 0x100; } + u32 r = u32(std::clamp(256.0f * prim.color.r * prim.color.a, 0.0f, 255.0f)); + u32 g = u32(std::clamp(256.0f * prim.color.g * prim.color.a, 0.0f, 255.0f)); + u32 b = u32(std::clamp(256.0f * prim.color.b * prim.color.a, 0.0f, 255.0f)); + u32 const inva = u32(std::clamp(256.0f * (1.0f - prim.color.a), 0.0f, 256.0f)); // pre-shift the RGBA pieces r = dest_rgb_to_pixel(r, 0, 0) << 8; diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index 41075c2573b..28011b8372c 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -1246,9 +1246,6 @@ int get_blend_mode(emu::render::detail::view_environment &env, util::xml::data_n layout_element::make_component_map const layout_element::s_make_component{ { "image", &make_component }, { "text", &make_component }, - { "dotmatrix", &make_dotmatrix_component<8> }, - { "dotmatrix5dot", &make_dotmatrix_component<5> }, - { "dotmatrixdot", &make_dotmatrix_component<1> }, { "simplecounter", &make_component }, { "reel", &make_component }, { "led7seg", &make_component }, @@ -3079,47 +3076,6 @@ protected: }; -// row of dots for a dotmatrix -class layout_element::dotmatrix_component : public component -{ -public: - // construction/destruction - dotmatrix_component(int dots, environment &env, util::xml::data_node const &compnode) - : component(env, compnode) - , m_dots(dots) - { - } - -protected: - // overrides - virtual int maxstate() const override { return (1 << m_dots) - 1; } - - virtual void draw_aligned(running_machine &machine, bitmap_argb32 &dest, const rectangle &bounds, int state) override - { - const rgb_t onpen = rgb_t(0xff, 0xff, 0xff, 0xff); - const rgb_t offpen = rgb_t(0xff, 0x20, 0x20, 0x20); - - // sizes for computation - int bmheight = 300; - int dotwidth = 250; - - // allocate a temporary bitmap for drawing - bitmap_argb32 tempbitmap(dotwidth*m_dots, bmheight); - tempbitmap.fill(rgb_t(0xff, 0x00, 0x00, 0x00)); - - for (int i = 0; i < m_dots; i++) - draw_segment_decimal(tempbitmap, ((dotwidth / 2) + (i * dotwidth)), bmheight / 2, dotwidth, BIT(state, i) ? onpen : offpen); - - // resample to the target size - render_resample_argb_bitmap_hq(dest, tempbitmap, color(state)); - } - -private: - // internal state - int m_dots; -}; - - // simple counter class layout_element::simplecounter_component : public component { @@ -3163,6 +3119,8 @@ public: , m_searchpath(env.search_path() ? env.search_path() : "") , m_dirname(env.directory_name() ? env.directory_name() : "") { + osd_printf_warning("Warning: layout file contains deprecated reel component\n"); + std::string_view symbollist = env.get_attribute_string(compnode, "symbollist", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15"); // split out position names from string and figure out our number of symbols @@ -3558,18 +3516,6 @@ layout_element::component::ptr layout_element::make_component(environment &env, } -//------------------------------------------------- -// make_component - create dotmatrix component -// with given vertical resolution -//------------------------------------------------- - -template -layout_element::component::ptr layout_element::make_dotmatrix_component(environment &env, util::xml::data_node const &compnode) -{ - return std::make_unique(D, env, compnode); -} - - //************************************************************************** // LAYOUT ELEMENT TEXTURE diff --git a/src/emu/rendlay.h b/src/emu/rendlay.h index befae560bcd..da9edfcf752 100644 --- a/src/emu/rendlay.h +++ b/src/emu/rendlay.h @@ -146,7 +146,6 @@ private: class led16seg_component; class led14segsc_component; class led16segsc_component; - class dotmatrix_component; class simplecounter_component; class reel_component; diff --git a/src/frontend/mame/cheat.cpp b/src/frontend/mame/cheat.cpp index 2946d2c2257..dbbd0ed78bc 100644 --- a/src/frontend/mame/cheat.cpp +++ b/src/frontend/mame/cheat.cpp @@ -418,6 +418,10 @@ cheat_script::script_entry::script_entry( if (!expression || !expression[0]) throw emu_fatalerror("%s.xml(%d): missing expression in action tag\n", filename, entrynode.line); m_expression.parse(expression); + + // initialise these to defautlt values + m_line = 0; + m_justify = ui::text_layout::text_justify::LEFT; } else { @@ -1056,6 +1060,9 @@ constexpr int cheat_manager::CHEAT_VERSION; cheat_manager::cheat_manager(running_machine &machine) : m_machine(machine) + , m_framecount(0) + , m_numlines(0) + , m_lastline(0) , m_disabled(true) , m_symtable(machine) { diff --git a/src/frontend/mame/luaengine_debug.cpp b/src/frontend/mame/luaengine_debug.cpp index e3817d95ced..8349cbd88fc 100644 --- a/src/frontend/mame/luaengine_debug.cpp +++ b/src/frontend/mame/luaengine_debug.cpp @@ -100,7 +100,7 @@ void lua_engine::initialize_debug(sol::table &emu) debugger_type["consolelog"] = sol::property([] (debugger_manager &debug) { return wrap_textbuf(debug.console().get_console_textbuf()); }); debugger_type["errorlog"] = sol::property([](debugger_manager &debug) { return wrap_textbuf(debug.console().get_errorlog_textbuf()); }); debugger_type["visible_cpu"] = sol::property( - [](debugger_manager &debug) { debug.console().get_visible_cpu(); }, + [](debugger_manager &debug) { return debug.console().get_visible_cpu(); }, [](debugger_manager &debug, device_t &dev) { debug.console().set_visible_cpu(&dev); }); debugger_type["execution_state"] = sol::property( [] (debugger_manager &debug) { return debug.cpu().is_stopped() ? "stop" : "run"; }, diff --git a/src/frontend/mame/ui/custui.cpp b/src/frontend/mame/ui/custui.cpp index 62396d7840b..02da9310207 100644 --- a/src/frontend/mame/ui/custui.cpp +++ b/src/frontend/mame/ui/custui.cpp @@ -83,10 +83,10 @@ menu_custom_ui::menu_custom_ui(mame_ui_manager &mui, render_container &container } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_custom_ui::~menu_custom_ui() +void menu_custom_ui::menu_dismissed() { ui().options().set_value(OPTION_HIDE_PANELS, ui_globals::panels_status, OPTION_PRIORITY_CMDLINE); @@ -375,10 +375,10 @@ void menu_font_ui::list() } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_font_ui::~menu_font_ui() +void menu_font_ui::menu_dismissed() { if (m_changed) { @@ -580,10 +580,10 @@ menu_colors_ui::menu_colors_ui(mame_ui_manager &mui, render_container &container } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_colors_ui::~menu_colors_ui() +void menu_colors_ui::menu_dismissed() { std::string dec_color; for (int index = 1; index < MUI_RESTORE; index++) @@ -607,7 +607,7 @@ void menu_colors_ui::handle(event const *ev) { if ((uintptr_t)ev->itemref != MUI_RESTORE) { - menu::stack_push(ui(), container(), &m_color_table[(uintptr_t)ev->itemref].color, selected_item().text()); + menu::stack_push(ui(), container(), &m_color_table[(uintptr_t)ev->itemref].color, std::string(selected_item().text())); } else { @@ -803,25 +803,17 @@ void menu_colors_ui::restore_colors() // ctor //------------------------------------------------- -menu_rgb_ui::menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *_color, std::string _title) - : menu(mui, container), - m_color(_color), - m_search(), - m_key_active(false), - m_lock_ref(0), - m_title(_title) +menu_rgb_ui::menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *color, std::string &&title) + : menu(mui, container) + , m_color(color) + , m_search() + , m_key_active(false) + , m_lock_ref(0) + , m_title(std::move(title)) { set_process_flags(PROCESS_LR_REPEAT); } -//------------------------------------------------- -// dtor -//------------------------------------------------- - -menu_rgb_ui::~menu_rgb_ui() -{ -} - //------------------------------------------------- // handle //------------------------------------------------- @@ -1111,14 +1103,6 @@ menu_palette_sel::menu_palette_sel(mame_ui_manager &mui, render_container &conta { } -//------------------------------------------------- -// dtor -//------------------------------------------------- - -menu_palette_sel::~menu_palette_sel() -{ -} - //------------------------------------------------- // handle //------------------------------------------------- diff --git a/src/frontend/mame/ui/custui.h b/src/frontend/mame/ui/custui.h index 34d417c8774..168934b5356 100644 --- a/src/frontend/mame/ui/custui.h +++ b/src/frontend/mame/ui/custui.h @@ -28,10 +28,10 @@ class menu_custom_ui : public menu { public: menu_custom_ui(mame_ui_manager &mui, render_container &container, std::function &&handler); - virtual ~menu_custom_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: virtual void populate(float &customtop, float &custombottom) override; @@ -55,10 +55,10 @@ class menu_font_ui : public menu { public: menu_font_ui(mame_ui_manager &mui, render_container &container, std::function &&handler); - virtual ~menu_font_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: virtual void populate(float &customtop, float &custombottom) override; @@ -89,10 +89,10 @@ class menu_colors_ui : public menu { public: menu_colors_ui(mame_ui_manager &mui, render_container &container); - virtual ~menu_colors_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: enum @@ -136,8 +136,7 @@ private: class menu_rgb_ui : public menu { public: - menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *_color, std::string _title); - virtual ~menu_rgb_ui() override; + menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *color, std::string &&title); protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -172,7 +171,6 @@ class menu_palette_sel : public menu { public: menu_palette_sel(mame_ui_manager &mui, render_container &container, rgb_t &_color); - virtual ~menu_palette_sel() override; private: virtual void populate(float &customtop, float &custombottom) override; diff --git a/src/frontend/mame/ui/filesel.h b/src/frontend/mame/ui/filesel.h index 9f7eea7dbea..11e5643c2de 100644 --- a/src/frontend/mame/ui/filesel.h +++ b/src/frontend/mame/ui/filesel.h @@ -61,10 +61,11 @@ private: struct file_selector_entry { - file_selector_entry() { } + file_selector_entry() = default; file_selector_entry(file_selector_entry &&) = default; file_selector_entry &operator=(file_selector_entry &&) = default; - file_selector_entry_type type; + + file_selector_entry_type type = SELECTOR_ENTRY_TYPE_EMPTY; std::string basename; std::string fullpath; }; diff --git a/src/frontend/mame/ui/sndmenu.cpp b/src/frontend/mame/ui/sndmenu.cpp index b1842969f8f..1ee1e82e25c 100644 --- a/src/frontend/mame/ui/sndmenu.cpp +++ b/src/frontend/mame/ui/sndmenu.cpp @@ -45,29 +45,25 @@ menu_sound_options::menu_sound_options(mame_ui_manager &mui, render_container &c } //------------------------------------------------- -// dtor +// menu_dismissed //------------------------------------------------- -menu_sound_options::~menu_sound_options() +void menu_sound_options::menu_dismissed() { emu_options &moptions = machine().options(); - if (strcmp(moptions.value(OSDOPTION_SOUND), m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE) != 0) - { + if (strcmp(moptions.value(OSDOPTION_SOUND), m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE)) moptions.set_value(OSDOPTION_SOUND, m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE, OPTION_PRIORITY_CMDLINE); - } + if (moptions.bool_value(OPTION_COMPRESSOR) != m_compressor) - { moptions.set_value(OPTION_COMPRESSOR, m_compressor, OPTION_PRIORITY_CMDLINE); - } + if (moptions.int_value(OPTION_SAMPLERATE) != m_sound_rate[m_cur_rates]) - { moptions.set_value(OPTION_SAMPLERATE, m_sound_rate[m_cur_rates], OPTION_PRIORITY_CMDLINE); - } + if (moptions.bool_value(OPTION_SAMPLES) != m_samples) - { moptions.set_value(OPTION_SAMPLES, m_samples, OPTION_PRIORITY_CMDLINE); - } + } //------------------------------------------------- diff --git a/src/frontend/mame/ui/sndmenu.h b/src/frontend/mame/ui/sndmenu.h index 35ac73981df..03f68202748 100644 --- a/src/frontend/mame/ui/sndmenu.h +++ b/src/frontend/mame/ui/sndmenu.h @@ -25,10 +25,10 @@ class menu_sound_options : public menu { public: menu_sound_options(mame_ui_manager &mui, render_container &container); - virtual ~menu_sound_options() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: enum diff --git a/src/frontend/mame/ui/textbox.cpp b/src/frontend/mame/ui/textbox.cpp index 71de239b35f..cd529aa297d 100644 --- a/src/frontend/mame/ui/textbox.cpp +++ b/src/frontend/mame/ui/textbox.cpp @@ -29,6 +29,7 @@ menu_textbox::menu_textbox(mame_ui_manager &mui, render_container &container) , m_layout_width(-1.0f) , m_desired_width(-1.0f) , m_desired_lines(-1) + , m_window_lines(0) , m_top_line(0) { } diff --git a/src/mame/layout/m1albsqp.lay b/src/mame/layout/m1albsqp.lay index e11e3c57055..a83f332bedc 100644 --- a/src/mame/layout/m1albsqp.lay +++ b/src/mame/layout/m1albsqp.lay @@ -1664,25 +1664,77 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1754,38 +1806,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -3834,206 +3862,60 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + @@ -6969,206 +6851,60 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + diff --git a/src/mame/layout/m1apollo2.lay b/src/mame/layout/m1apollo2.lay index 6993cd7abe5..6609cd71975 100644 --- a/src/mame/layout/m1apollo2.lay +++ b/src/mame/layout/m1apollo2.lay @@ -3352,25 +3352,77 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3442,38 +3494,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -5494,206 +5522,60 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + @@ -8848,206 +8730,60 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + diff --git a/src/mame/layout/m1bargnc.lay b/src/mame/layout/m1bargnc.lay index 483b9945eb5..32ac62fe8e5 100644 --- a/src/mame/layout/m1bargnc.lay +++ b/src/mame/layout/m1bargnc.lay @@ -1456,25 +1456,77 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1546,38 +1598,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -3664,206 +3692,60 @@ - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + @@ -6664,206 +6546,60 @@ - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + diff --git a/src/mame/layout/sc2casr2.lay b/src/mame/layout/sc2casr2.lay index d03cb57f9dc..9445fb007a5 100644 --- a/src/mame/layout/sc2casr2.lay +++ b/src/mame/layout/sc2casr2.lay @@ -1612,35 +1612,115 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1712,38 +1792,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -3794,326 +3850,92 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + @@ -6617,326 +6439,92 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + diff --git a/src/mame/layout/sc2prem2.lay b/src/mame/layout/sc2prem2.lay index 3904d08dad9..063a1d64435 100644 --- a/src/mame/layout/sc2prem2.lay +++ b/src/mame/layout/sc2prem2.lay @@ -1773,338 +1773,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -2171,38 +1928,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -2525,60 +2258,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -2586,60 +2274,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -2647,60 +2290,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -2708,60 +2306,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -4911,60 +4464,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -4972,60 +4480,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -5033,60 +4496,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - @@ -5094,60 +4512,15 @@ - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - diff --git a/src/tools/srcclean.cpp b/src/tools/srcclean.cpp index b8402d31f7a..19f550d6f17 100644 --- a/src/tools/srcclean.cpp +++ b/src/tools/srcclean.cpp @@ -186,7 +186,7 @@ private: // output state management unsigned m_output_column = 0U; - unsigned m_indent; + unsigned m_indent = 0U; unsigned m_tab_limit = std::numeric_limits::max(); std::vector m_whitespace; -- cgit v1.2.3