summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/finalizr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/finalizr.c')
-rw-r--r--src/mame/video/finalizr.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index 0a179ae908a..705347f0cfc 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -44,34 +44,32 @@ PALETTE_INIT( finalizr )
}
}
-static TILE_GET_INFO( get_bg_tile_info )
+TILE_GET_INFO_MEMBER(finalizr_state::get_bg_tile_info)
{
- finalizr_state *state = machine.driver_data<finalizr_state>();
- int attr = state->m_colorram[tile_index];
- int code = state->m_videoram[tile_index] + ((attr & 0xc0) << 2) + (state->m_charbank << 10);
+ int attr = m_colorram[tile_index];
+ int code = m_videoram[tile_index] + ((attr & 0xc0) << 2) + (m_charbank << 10);
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO(0, code, color, flags);
+ SET_TILE_INFO_MEMBER(0, code, color, flags);
}
-static TILE_GET_INFO( get_fg_tile_info )
+TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info)
{
- finalizr_state *state = machine.driver_data<finalizr_state>();
- int attr = state->m_colorram2[tile_index];
- int code = state->m_videoram2[tile_index] + ((attr & 0xc0) << 2);
+ int attr = m_colorram2[tile_index];
+ int code = m_videoram2[tile_index] + ((attr & 0xc0) << 2);
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO(0, code, color, flags);
+ SET_TILE_INFO_MEMBER(0, code, color, flags);
}
VIDEO_START( finalizr )
{
finalizr_state *state = machine.driver_data<finalizr_state>();
- state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
- state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
+ state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
+ state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
}