diff options
Diffstat (limited to 'src/mame/video/realbrk.c')
-rw-r--r-- | src/mame/video/realbrk.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 07dcaa965f7..21fd6608ebc 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -68,24 +68,22 @@ WRITE16_MEMBER(realbrk_state::dai2kaku_flipscreen_w) ***************************************************************************/ -static TILE_GET_INFO( get_tile_info_0 ) +TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_0) { - realbrk_state *state = machine.driver_data<realbrk_state>(); - UINT16 attr = state->m_vram_0[tile_index * 2 + 0]; - UINT16 code = state->m_vram_0[tile_index * 2 + 1]; - SET_TILE_INFO( + UINT16 attr = m_vram_0[tile_index * 2 + 0]; + UINT16 code = m_vram_0[tile_index * 2 + 1]; + SET_TILE_INFO_MEMBER( 0, code, attr & 0x7f, TILE_FLIPYX( attr >> 14 )); } -static TILE_GET_INFO( get_tile_info_1 ) +TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_1) { - realbrk_state *state = machine.driver_data<realbrk_state>(); - UINT16 attr = state->m_vram_1[tile_index * 2 + 0]; - UINT16 code = state->m_vram_1[tile_index * 2 + 1]; - SET_TILE_INFO( + UINT16 attr = m_vram_1[tile_index * 2 + 0]; + UINT16 code = m_vram_1[tile_index * 2 + 1]; + SET_TILE_INFO_MEMBER( 0, code, attr & 0x7f, @@ -118,14 +116,13 @@ WRITE16_MEMBER(realbrk_state::realbrk_vram_1_w) ***************************************************************************/ -static TILE_GET_INFO( get_tile_info_2 ) +TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_2) { - realbrk_state *state = machine.driver_data<realbrk_state>(); - UINT16 code = state->m_vram_2[tile_index]; - SET_TILE_INFO( + UINT16 code = m_vram_2[tile_index]; + SET_TILE_INFO_MEMBER( 1, code & 0x0fff, - ((code & 0xf000) >> 12) | ((state->m_vregs[0xa/2] & 0x7f) << 4), + ((code & 0xf000) >> 12) | ((m_vregs[0xa/2] & 0x7f) << 4), 0); } @@ -149,11 +146,11 @@ VIDEO_START(realbrk) { realbrk_state *state = machine.driver_data<realbrk_state>(); /* Backgrounds */ - state->m_tilemap_0 = tilemap_create(machine, get_tile_info_0, TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); - state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1, TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); + state->m_tilemap_0 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_0),state), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); + state->m_tilemap_1 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_1),state), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); /* Text */ - state->m_tilemap_2 = tilemap_create(machine, get_tile_info_2, TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); + state->m_tilemap_2 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_2),state), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); state->m_tilemap_0->set_transparent_pen(0); state->m_tilemap_1->set_transparent_pen(0); |