diff options
Diffstat (limited to 'src/mame/video/jack.c')
-rw-r--r-- | src/mame/video/jack.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index f247a114dbb..d621273fef3 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -55,10 +55,9 @@ TILEMAP_MAPPER_MEMBER(jack_state::tilemap_scan_cols_flipy) return (col * num_rows) + (num_rows - 1 - row); } -VIDEO_START( jack ) +void jack_state::video_start() { - jack_state *state = machine.driver_data<jack_state>(); - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),state), 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); } static void jack_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -107,12 +106,12 @@ SCREEN_UPDATE_IND16( jack ) 3bpp gfx and different banking / colors bits */ -PALETTE_INIT( joinem ) +PALETTE_INIT_MEMBER(jack_state,joinem) { - const UINT8 *color_prom = machine.root_device().memregion("proms")->base(); + const UINT8 *color_prom = machine().root_device().memregion("proms")->base(); int i; - for (i = 0; i < machine.total_colors(); i++) + for (i = 0; i < machine().total_colors(); i++) { int bit0, bit1, bit2, r, g, b; bit0 = (color_prom[i] >> 0) & 0x01; @@ -128,7 +127,7 @@ PALETTE_INIT( joinem ) bit2 = (color_prom[i] >> 7) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - palette_set_color(machine, i, MAKE_RGB(r,g,b)); + palette_set_color(machine(), i, MAKE_RGB(r,g,b)); } } @@ -140,10 +139,9 @@ TILE_GET_INFO_MEMBER(jack_state::joinem_get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START( joinem ) +VIDEO_START_MEMBER(jack_state,joinem) { - jack_state *state = machine.driver_data<jack_state>(); - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),state), 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); } static void joinem_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) |