diff options
Diffstat (limited to 'src/mame/video/travrusa.c')
-rw-r--r-- | src/mame/video/travrusa.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index d2d7503ffa3..93bd2ec64b1 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -37,13 +37,13 @@ J Clegg ***************************************************************************/ -PALETTE_INIT( travrusa ) +void travrusa_state::palette_init() { - const UINT8 *color_prom = machine.root_device().memregion("proms")->base(); + const UINT8 *color_prom = machine().root_device().memregion("proms")->base(); int i; /* allocate the colortable */ - machine.colortable = colortable_alloc(machine, 0x90); + machine().colortable = colortable_alloc(machine(), 0x90); /* create a lookup table for the palette */ for (i = 0; i < 0x80; i++) @@ -69,7 +69,7 @@ PALETTE_INIT( travrusa ) bit2 = (color_prom[i] >> 2) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - colortable_palette_set_color(machine.colortable, i, MAKE_RGB(r, g, b)); + colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b)); } for (i = 0x80; i < 0x90; i++) @@ -95,7 +95,7 @@ PALETTE_INIT( travrusa ) bit2 = (color_prom[(i - 0x80) + 0x200] >> 2) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - colortable_palette_set_color(machine.colortable, i, MAKE_RGB(r, g, b)); + colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b)); } /* color_prom now points to the beginning of the lookup table */ @@ -103,23 +103,23 @@ PALETTE_INIT( travrusa ) /* characters */ for (i = 0; i < 0x80; i++) - colortable_entry_set_value(machine.colortable, i, i); + colortable_entry_set_value(machine().colortable, i, i); /* sprites */ for (i = 0x80; i < 0x100; i++) { UINT8 ctabentry = (color_prom[i - 0x80] & 0x0f) | 0x80; - colortable_entry_set_value(machine.colortable, i, ctabentry); + colortable_entry_set_value(machine().colortable, i, ctabentry); } } -PALETTE_INIT( shtrider ) +PALETTE_INIT_MEMBER(travrusa_state,shtrider) { - const UINT8 *color_prom = machine.root_device().memregion("proms")->base(); + const UINT8 *color_prom = machine().root_device().memregion("proms")->base(); int i; /* allocate the colortable */ - machine.colortable = colortable_alloc(machine, 0x90); + machine().colortable = colortable_alloc(machine(), 0x90); /* create a lookup table for the palette */ for (i = 0; i < 0x80; i++) @@ -145,7 +145,7 @@ PALETTE_INIT( shtrider ) bit2 = (color_prom[i + 0x100] >> 2) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - colortable_palette_set_color(machine.colortable, i, MAKE_RGB(r, g, b)); + colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b)); } for (i = 0x80; i < 0x90; i++) @@ -171,7 +171,7 @@ PALETTE_INIT( shtrider ) bit2 = (color_prom[(i - 0x80) + 0x200] >> 2) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - colortable_palette_set_color(machine.colortable, i, MAKE_RGB(r, g, b)); + colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b)); } /* color_prom now points to the beginning of the lookup table */ @@ -179,13 +179,13 @@ PALETTE_INIT( shtrider ) /* characters */ for (i = 0; i < 0x80; i++) - colortable_entry_set_value(machine.colortable, i, i); + colortable_entry_set_value(machine().colortable, i, i); /* sprites */ for (i = 0x80; i < 0x100; i++) { UINT8 ctabentry = (color_prom[i - 0x80] & 0x0f) | 0x80; - colortable_entry_set_value(machine.colortable, i, ctabentry); + colortable_entry_set_value(machine().colortable, i, ctabentry); } } @@ -219,18 +219,17 @@ TILE_GET_INFO_MEMBER(travrusa_state::get_tile_info) ***************************************************************************/ -VIDEO_START( travrusa ) +void travrusa_state::video_start() { - travrusa_state *state = machine.driver_data<travrusa_state>(); - state->save_item(NAME(state->m_scrollx)); + save_item(NAME(m_scrollx)); - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(travrusa_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(travrusa_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - state->m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ - state->m_bg_tilemap->set_transmask(1, 0x3f, 0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ + m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ + m_bg_tilemap->set_transmask(1, 0x3f, 0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ - state->m_bg_tilemap->set_scroll_rows(4); + m_bg_tilemap->set_scroll_rows(4); } |