diff options
author | 2021-11-25 01:55:53 +1100 | |
---|---|---|
committer | 2021-11-25 01:55:53 +1100 | |
commit | c378ea087097d75cd7f4fb69da062048eaaae5e6 (patch) | |
tree | 0711e315d3d2a7fc74cae27f6faea01a6af37f34 /src/emu/rendlay.cpp | |
parent | 4e74563abb4c8b385baa72d0c2d5f3987fa88652 (diff) |
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.
Diffstat (limited to 'src/emu/rendlay.cpp')
-rw-r--r-- | src/emu/rendlay.cpp | 58 |
1 files changed, 2 insertions, 56 deletions
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<image_component> }, { "text", &make_component<text_component> }, - { "dotmatrix", &make_dotmatrix_component<8> }, - { "dotmatrix5dot", &make_dotmatrix_component<5> }, - { "dotmatrixdot", &make_dotmatrix_component<1> }, { "simplecounter", &make_component<simplecounter_component> }, { "reel", &make_component<reel_component> }, { "led7seg", &make_component<led7seg_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 <int D> -layout_element::component::ptr layout_element::make_dotmatrix_component(environment &env, util::xml::data_node const &compnode) -{ - return std::make_unique<dotmatrix_component>(D, env, compnode); -} - - //************************************************************************** // LAYOUT ELEMENT TEXTURE |