diff options
Diffstat (limited to 'src/mame/video/metlclsh.c')
-rw-r--r-- | src/mame/video/metlclsh.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 450f3f2d1d5..1d39ea2004a 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -64,15 +64,14 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_gfxbank_w) ***************************************************************************/ -static TILEMAP_MAPPER( metlclsh_bgtilemap_scan ) +TILEMAP_MAPPER_MEMBER(metlclsh_state::metlclsh_bgtilemap_scan) { return (row & 7) + ((row & ~7) << 4) + ((col & 0xf) << 3) + ((col & ~0xf) << 4); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(metlclsh_state::get_bg_tile_info) { - metlclsh_state *state = machine.driver_data<metlclsh_state>(); - SET_TILE_INFO(1, state->m_bgram[tile_index] + (state->m_gfxbank << 7), 0, 0); + SET_TILE_INFO_MEMBER(1, m_bgram[tile_index] + (m_gfxbank << 7), 0, 0); } WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w) @@ -112,12 +111,11 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w) ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(metlclsh_state::get_fg_tile_info) { - metlclsh_state *state = machine.driver_data<metlclsh_state>(); - UINT8 code = state->m_fgram[tile_index + 0x000]; - UINT8 attr = state->m_fgram[tile_index + 0x400]; - SET_TILE_INFO(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); + UINT8 code = m_fgram[tile_index + 0x000]; + UINT8 attr = m_fgram[tile_index + 0x400]; + SET_TILE_INFO_MEMBER(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); tileinfo.category = ((attr & 0x80) ? 1 : 2); } @@ -140,8 +138,8 @@ VIDEO_START( metlclsh ) state->m_otherram = auto_alloc_array(machine, UINT8, 0x800); // banked ram - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, metlclsh_bgtilemap_scan, 16, 16, 32, 16); - 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(metlclsh_state::get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(metlclsh_state::metlclsh_bgtilemap_scan),state), 16, 16, 32, 16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(metlclsh_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bg_tilemap->set_transparent_pen(0); state->m_fg_tilemap->set_transparent_pen(0); |