diff options
Diffstat (limited to 'src/mame/video/atarig42.c')
-rw-r--r-- | src/mame/video/atarig42.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 7e2f7bcb7c9..1c298021b18 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -31,29 +31,27 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info) { - atarig42_state *state = machine.driver_data<atarig42_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarig42_state::get_playfield_tile_info) { - atarig42_state *state = machine.driver_data<atarig42_state>(); - UINT16 data = state->m_playfield[tile_index]; - int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); - int color = (state->m_playfield_base >> 5) + ((state->m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); - SET_TILE_INFO(0, code, color, (data >> 15) & 1); - tileinfo.category = (state->m_playfield_color_bank >> 2) & 7; + UINT16 data = m_playfield[tile_index]; + int code = (m_playfield_tile_bank << 12) | (data & 0xfff); + int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); + tileinfo.category = (m_playfield_color_bank >> 2) & 7; } -static TILEMAP_MAPPER( atarig42_playfield_scan ) +TILEMAP_MAPPER_MEMBER(atarig42_state::atarig42_playfield_scan) { int bank = 1 - (col / (num_cols / 2)); return bank * (num_rows * num_cols / 2) + row * (num_cols / 2) + (col % (num_cols / 2)); @@ -75,13 +73,13 @@ VIDEO_START( atarig42 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarig42_state::get_playfield_tile_info),state), tilemap_mapper_delegate(FUNC(atarig42_state::atarig42_playfield_scan),state), 8,8, 128,64); /* initialize the motion objects */ state->m_rle = machine.device("rle"); /* 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(atarig42_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ |