summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/mcatadv.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/mcatadv.c')
-rw-r--r--src/mame/video/mcatadv.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index 4af6dac3cea..9d64e773eb3 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -13,14 +13,13 @@ ToDo: Fix Sprites & Rowscroll/Select for Cocktail
#include "emu.h"
#include "includes/mcatadv.h"
-static TILE_GET_INFO( get_mcatadv_tile_info1 )
+TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info1)
{
- mcatadv_state *state = machine.driver_data<mcatadv_state>();
- int tileno = state->m_videoram1[tile_index * 2 + 1];
- int colour = (state->m_videoram1[tile_index * 2] & 0x3f00) >> 8;
- int pri = (state->m_videoram1[tile_index * 2] & 0xc000) >> 14;
+ int tileno = m_videoram1[tile_index * 2 + 1];
+ int colour = (m_videoram1[tile_index * 2] & 0x3f00) >> 8;
+ int pri = (m_videoram1[tile_index * 2] & 0xc000) >> 14;
- SET_TILE_INFO(0,tileno,colour + state->m_palette_bank1 * 0x40, 0);
+ SET_TILE_INFO_MEMBER(0,tileno,colour + m_palette_bank1 * 0x40, 0);
tileinfo.category = pri;
}
@@ -31,14 +30,13 @@ WRITE16_MEMBER(mcatadv_state::mcatadv_videoram1_w)
m_tilemap1->mark_tile_dirty(offset / 2);
}
-static TILE_GET_INFO( get_mcatadv_tile_info2 )
+TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info2)
{
- mcatadv_state *state = machine.driver_data<mcatadv_state>();
- int tileno = state->m_videoram2[tile_index * 2 + 1];
- int colour = (state->m_videoram2[tile_index * 2] & 0x3f00) >> 8;
- int pri = (state->m_videoram2[tile_index * 2] & 0xc000) >> 14;
+ int tileno = m_videoram2[tile_index * 2 + 1];
+ int colour = (m_videoram2[tile_index * 2] & 0x3f00) >> 8;
+ int pri = (m_videoram2[tile_index * 2] & 0xc000) >> 14;
- SET_TILE_INFO(1, tileno, colour + state->m_palette_bank2 * 0x40, 0);
+ SET_TILE_INFO_MEMBER(1, tileno, colour + m_palette_bank2 * 0x40, 0);
tileinfo.category = pri;
}
@@ -253,10 +251,10 @@ SCREEN_UPDATE_IND16( mcatadv )
VIDEO_START( mcatadv )
{
mcatadv_state *state = machine.driver_data<mcatadv_state>();
- state->m_tilemap1 = tilemap_create(machine, get_mcatadv_tile_info1, TILEMAP_SCAN_ROWS, 16, 16, 32, 32);
+ state->m_tilemap1 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info1),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32);
state->m_tilemap1->set_transparent_pen(0);
- state->m_tilemap2 = tilemap_create(machine, get_mcatadv_tile_info2, TILEMAP_SCAN_ROWS, 16, 16, 32, 32);
+ state->m_tilemap2 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info2),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32);
state->m_tilemap2->set_transparent_pen(0);
state->m_spriteram_old = auto_alloc_array_clear(machine, UINT16, state->m_spriteram.bytes() / 2);