diff options
Diffstat (limited to 'src/mame/video/skullxbo.c')
-rw-r--r-- | src/mame/video/skullxbo.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 9c925f2597f..ae09ea53f98 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -16,25 +16,23 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(skullxbo_state::get_alpha_tile_info) { - skullxbo_state *state = machine.driver_data<skullxbo_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = (data ^ 0x400) & 0x7ff; int color = (data >> 11) & 0x0f; 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(skullxbo_state::get_playfield_tile_info) { - skullxbo_state *state = machine.driver_data<skullxbo_state>(); - UINT16 data1 = state->m_playfield[tile_index]; - UINT16 data2 = state->m_playfield_upper[tile_index] & 0xff; + UINT16 data1 = m_playfield[tile_index]; + UINT16 data2 = m_playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO(1, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(1, code, color, (data1 >> 15) & 1); } @@ -86,13 +84,13 @@ VIDEO_START( skullxbo ) skullxbo_state *state = machine.driver_data<skullxbo_state>(); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_COLS, 16,8, 64,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(skullxbo_state::get_playfield_tile_info),state), TILEMAP_SCAN_COLS, 16,8, 64,64); /* 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, 16,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(skullxbo_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 16,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); } |