summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/atarigx2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/atarigx2.c')
-rw-r--r--src/mame/video/atarigx2.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c
index 3922039da2a..88a287a03b7 100644
--- a/src/mame/video/atarigx2.c
+++ b/src/mame/video/atarigx2.c
@@ -31,29 +31,27 @@
*
*************************************/
-static TILE_GET_INFO( get_alpha_tile_info )
+TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info)
{
- atarigx2_state *state = machine.driver_data<atarigx2_state>();
- UINT16 data = state->m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1));
+ UINT16 data = m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1));
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(atarigx2_state::get_playfield_tile_info)
{
- atarigx2_state *state = machine.driver_data<atarigx2_state>();
- UINT16 data = state->m_playfield32[tile_index / 2] >> (16 * (~tile_index & 1));
- 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_playfield32[tile_index / 2] >> (16 * (~tile_index & 1));
+ 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( atarigx2_playfield_scan )
+TILEMAP_MAPPER_MEMBER(atarigx2_state::atarigx2_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( atarigx2 )
atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30);
/* initialize the playfield */
- state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64);
+ state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarigx2_state::get_playfield_tile_info),state), tilemap_mapper_delegate(FUNC(atarigx2_state::atarigx2_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(atarigx2_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32);
state->m_alpha_tilemap->set_transparent_pen(0);
/* save states */