diff options
Diffstat (limited to 'src/mame/video/srumbler.c')
-rw-r--r-- | src/mame/video/srumbler.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 7f6b01758d4..9c49e0996f8 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -16,24 +16,22 @@ ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(srumbler_state::get_fg_tile_info) { - srumbler_state *state = machine.driver_data<srumbler_state>(); - UINT8 attr = state->m_foregroundram[2*tile_index]; - SET_TILE_INFO( + UINT8 attr = m_foregroundram[2*tile_index]; + SET_TILE_INFO_MEMBER( 0, - state->m_foregroundram[2*tile_index + 1] + ((attr & 0x03) << 8), + m_foregroundram[2*tile_index + 1] + ((attr & 0x03) << 8), (attr & 0x3c) >> 2, (attr & 0x40) ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(srumbler_state::get_bg_tile_info) { - srumbler_state *state = machine.driver_data<srumbler_state>(); - UINT8 attr = state->m_backgroundram[2*tile_index]; - SET_TILE_INFO( + UINT8 attr = m_backgroundram[2*tile_index]; + SET_TILE_INFO_MEMBER( 1, - state->m_backgroundram[2*tile_index + 1] + ((attr & 0x07) << 8), + m_backgroundram[2*tile_index + 1] + ((attr & 0x07) << 8), (attr & 0xe0) >> 5, ((attr & 0x08) ? TILE_FLIPY : 0)); tileinfo.group = (attr & 0x10) >> 4; @@ -50,8 +48,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( srumbler ) { srumbler_state *state = machine.driver_data<srumbler_state>(); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,TILEMAP_SCAN_COLS,8,8,64,32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,TILEMAP_SCAN_COLS, 16,16,64,64); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(srumbler_state::get_fg_tile_info),state),TILEMAP_SCAN_COLS,8,8,64,32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(srumbler_state::get_bg_tile_info),state),TILEMAP_SCAN_COLS, 16,16,64,64); state->m_fg_tilemap->set_transparent_pen(3); |