diff options
Diffstat (limited to 'src/mame/video/tankbust.c')
-rw-r--r-- | src/mame/video/tankbust.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 0c6f57eb3e0..2f569130e3f 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -26,11 +26,10 @@ note: */ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(tankbust_state::get_bg_tile_info) { - tankbust_state *state = machine.driver_data<tankbust_state>(); - int code = state->m_videoram[tile_index]; - int attr = state->m_colorram[tile_index]; + int code = m_videoram[tile_index]; + int attr = m_colorram[tile_index]; int color = ((attr>>4) & 0x07); @@ -51,19 +50,18 @@ static TILE_GET_INFO( get_bg_tile_info ) /* priority bg/sprites (1 = this bg tile on top of sprites) */ tileinfo.category = (attr & 0x08) >> 3; - SET_TILE_INFO( 1, + SET_TILE_INFO_MEMBER( 1, code, (color&4) | ((color&2)>>1) | ((color&1)<<1), 0); } -static TILE_GET_INFO( get_txt_tile_info ) +TILE_GET_INFO_MEMBER(tankbust_state::get_txt_tile_info) { - tankbust_state *state = machine.driver_data<tankbust_state>(); - int code = state->m_txtram[tile_index]; + int code = m_txtram[tile_index]; int color = ((code>>6) & 0x03); - SET_TILE_INFO( 2, + SET_TILE_INFO_MEMBER( 2, code & 0x3f, ((color&2)>>1) | ((color&1)<<1), 0); @@ -80,10 +78,10 @@ VIDEO_START( tankbust ) { tankbust_state *state = machine.driver_data<tankbust_state>(); /* not scrollable */ - state->m_txt_tilemap = tilemap_create(machine, get_txt_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_txt_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(tankbust_state::get_txt_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* scrollable */ - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(tankbust_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); state->m_txt_tilemap->set_transparent_pen(0); |