From af98f7eba4113dba0b2a3c4338072387d450bbbb Mon Sep 17 00:00:00 2001 From: Robbbert Date: Wed, 14 Dec 2016 22:44:00 +1100 Subject: [PATCH] Do MT 04796 & 06452 a cleaner way (nw) --- src/mame/video/m58.cpp | 19 ++----------------- src/mame/video/phoenix.cpp | 30 ------------------------------ 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/src/mame/video/m58.cpp b/src/mame/video/m58.cpp index 2120ee396d7..352f57c31c7 100644 --- a/src/mame/video/m58.cpp +++ b/src/mame/video/m58.cpp @@ -171,6 +171,7 @@ TILEMAP_MAPPER_MEMBER(m58_state::tilemap_scan_rows) void m58_state::video_start() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m58_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(m58_state::tilemap_scan_rows),this), 8, 8, 64, 32); + m_bg_tilemap->set_scrolldy(32, 32); m_screen->register_screen_bitmap(m_scroll_panel_bitmap); save_item(NAME(m_scroll_panel_bitmap)); @@ -186,24 +187,8 @@ void m58_state::video_start() WRITE8_MEMBER(m58_state::flipscreen_w) { - int width = m_screen->width(); - int height = m_screen->height(); - const rectangle &visarea = m_screen->visible_area(); - /* screen flip is handled both by software and hardware */ - bool flipscreen = BIT(data, 0) ^ BIT(~ioport("DSW2")->read(), 0); - flip_screen_set(flipscreen); - - if (flipscreen) - { - m_bg_tilemap->set_scrolldx(0, 0); - m_bg_tilemap->set_scrolldy(0, 32); - } - else - { - m_bg_tilemap->set_scrolldx(visarea.min_x, width - (visarea.max_x + 1)); - m_bg_tilemap->set_scrolldy(visarea.min_y - 8, height + 16 - (visarea.max_y + 1)); - } + flip_screen_set(BIT(data, 0) ^ BIT(~ioport("DSW2")->read(), 0)); machine().bookkeeping().coin_counter_w(0, data & 0x02); machine().bookkeeping().coin_counter_w(1, data & 0x20); diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp index 3d86eab1c26..5c7b365924c 100644 --- a/src/mame/video/phoenix.cpp +++ b/src/mame/video/phoenix.cpp @@ -243,21 +243,6 @@ WRITE8_MEMBER(phoenix_state::phoenix_videoreg_w) m_cocktail_mode = m_videoram_pg_index && (ioport("CAB")->read() & 0x01); - if (m_cocktail_mode) - { - m_fg_tilemap->set_scrolldx(0, 0); - m_bg_tilemap->set_scrolldx(0, 0); - m_fg_tilemap->set_scrolldy(0, 0); - m_bg_tilemap->set_scrolldy(0, 0); - } - else - { - m_fg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); - m_bg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); - m_fg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); - m_bg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); - } - machine().tilemap().set_flip_all(m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); machine().tilemap().mark_all_dirty(); } @@ -281,21 +266,6 @@ WRITE8_MEMBER(phoenix_state::pleiads_videoreg_w) m_cocktail_mode = m_videoram_pg_index && (ioport("CAB")->read() & 0x01); - if (m_cocktail_mode) - { - m_fg_tilemap->set_scrolldx(0, 0); - m_bg_tilemap->set_scrolldx(0, 0); - m_fg_tilemap->set_scrolldy(0, 0); - m_bg_tilemap->set_scrolldy(0, 0); - } - else - { - m_fg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); - m_bg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); - m_fg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); - m_bg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); - } - machine().tilemap().set_flip_all(m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); machine().tilemap().mark_all_dirty(); }