diff --git a/src/mame/video/boogwing.cpp b/src/mame/video/boogwing.cpp index ce885ae8fb5..924fb0be30c 100644 --- a/src/mame/video/boogwing.cpp +++ b/src/mame/video/boogwing.cpp @@ -28,8 +28,7 @@ void boogwing_state::mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, c bitmap_ind16 *sprite_bitmap1, *sprite_bitmap2; bitmap_ind8* priority_bitmap; - address_space &space = machine().dummy_space(); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); sprite_bitmap1 = &m_sprgen1->get_sprite_temp_bitmap(); sprite_bitmap2 = &m_sprgen2->get_sprite_temp_bitmap(); @@ -182,7 +181,7 @@ uint32_t boogwing_state::screen_update_boogwing(screen_device &screen, bitmap_rg { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); /* Draw sprite planes to bitmaps for later mixing */ m_sprgen2->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true); diff --git a/src/mame/video/cninja.cpp b/src/mame/video/cninja.cpp index 3116f59711f..c19c5b24d63 100644 --- a/src/mame/video/cninja.cpp +++ b/src/mame/video/cninja.cpp @@ -201,7 +201,7 @@ uint32_t cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind1 { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); /* One of the tilemap chips can switch between 2 tilemaps at 4bpp, or 1 at 8bpp */ if (priority & 4) @@ -258,7 +258,7 @@ uint32_t cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); flip_screen_set(BIT(flip, 7)); diff --git a/src/mame/video/dassault.cpp b/src/mame/video/dassault.cpp index c09ff6381f3..79be65a70ed 100644 --- a/src/mame/video/dassault.cpp +++ b/src/mame/video/dassault.cpp @@ -78,7 +78,7 @@ uint32_t dassault_state::screen_update_dassault(screen_device &screen, bitmap_rg { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); m_sprgen2->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, false); m_sprgen1->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, false); diff --git a/src/mame/video/decocomn.cpp b/src/mame/video/decocomn.cpp index 61a5226b21d..3087d9130f7 100644 --- a/src/mame/video/decocomn.cpp +++ b/src/mame/video/decocomn.cpp @@ -119,7 +119,7 @@ WRITE16_MEMBER( decocomn_device::priority_w ) m_priority = data; } -READ16_MEMBER( decocomn_device::priority_r ) +uint16_t decocomn_device::priority_r() { return m_priority; } diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h index 80879d3810d..5423ea160ad 100644 --- a/src/mame/video/decocomn.h +++ b/src/mame/video/decocomn.h @@ -29,7 +29,7 @@ public: DECLARE_WRITE16_MEMBER( buffered_palette_w ); DECLARE_WRITE16_MEMBER( palette_dma_w ); DECLARE_WRITE16_MEMBER( priority_w ); - DECLARE_READ16_MEMBER( priority_r ); + uint16_t priority_r(); DECLARE_READ16_MEMBER( d_71_r ); protected: diff --git a/src/mame/video/rohga.cpp b/src/mame/video/rohga.cpp index 0a387565c30..6bf0442bc33 100644 --- a/src/mame/video/rohga.cpp +++ b/src/mame/video/rohga.cpp @@ -24,7 +24,7 @@ uint32_t rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &b { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); /* Update playfields */ flip_screen_set(BIT(flip, 7)); @@ -127,7 +127,7 @@ uint32_t rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32 { address_space &space = machine().dummy_space(); uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff); - uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff); + uint16_t priority = m_decocomn->priority_r(); /* draw sprite gfx to temp bitmaps */ m_sprgen2->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);