diff options
Diffstat (limited to 'src/mame/video/xybots.c')
-rw-r--r-- | src/mame/video/xybots.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index 39b8d272da8..28d1781d579 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -17,24 +17,22 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(xybots_state::get_alpha_tile_info) { - xybots_state *state = machine.driver_data<xybots_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 12) & 7; int opaque = data & 0x8000; - SET_TILE_INFO(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(xybots_state::get_playfield_tile_info) { - xybots_state *state = machine.driver_data<xybots_state>(); - UINT16 data = state->m_playfield[tile_index]; + UINT16 data = m_playfield[tile_index]; int code = data & 0x1fff; int color = (data >> 11) & 0x0f; - SET_TILE_INFO(0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } @@ -86,13 +84,13 @@ VIDEO_START( xybots ) xybots_state *state = machine.driver_data<xybots_state>(); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(xybots_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(xybots_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); } |