diff options
Diffstat (limited to 'src/mame/video/cninja.c')
-rw-r--r-- | src/mame/video/cninja.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 767127ca095..521f9763479 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -126,7 +126,7 @@ static void cninjabl_draw_sprites( running_machine &machine, bitmap_ind16 &bitma UINT32 cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = screen.machine().driver_data()->generic_space(); + address_space &space = machine().driver_data()->generic_space(); UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff); flip_screen_set(BIT(flip, 7)); @@ -134,20 +134,20 @@ UINT32 cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &b deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll); /* Draw playfields */ - screen.machine().priority_bitmap.fill(0, cliprect); + machine().priority_bitmap.fill(0, cliprect); bitmap.fill(512, cliprect); deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1); deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2); deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 2); deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 4); - screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); + machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); return 0; } UINT32 cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = screen.machine().driver_data()->generic_space(); + address_space &space = machine().driver_data()->generic_space(); UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff); /* force layers to be enabled */ @@ -159,39 +159,39 @@ UINT32 cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16 deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll); /* Draw playfields */ - screen.machine().priority_bitmap.fill(0, cliprect); + machine().priority_bitmap.fill(0, cliprect); bitmap.fill(512, cliprect); deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1); deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2); deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 2); deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 4); - cninjabl_draw_sprites(screen.machine(), bitmap, cliprect); + cninjabl_draw_sprites(machine(), bitmap, cliprect); deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); return 0; } UINT32 cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = screen.machine().driver_data()->generic_space(); + address_space &space = machine().driver_data()->generic_space(); UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff); flip_screen_set(BIT(flip, 7)); deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll); deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll); - screen.machine().priority_bitmap.fill(0, cliprect); + machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0, cliprect); deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1); deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2); deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 4); - screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); + machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); return 0; } UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = screen.machine().driver_data()->generic_space(); + address_space &space = machine().driver_data()->generic_space(); UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff); UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff); @@ -215,7 +215,7 @@ UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll); /* Draw playfields */ - screen.machine().priority_bitmap.fill(0, cliprect); + machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0x200, cliprect); if ((priority & 4) == 0) @@ -235,7 +235,7 @@ UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 break; } - screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); + machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400); deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); return 0; } @@ -248,7 +248,7 @@ VIDEO_START_MEMBER(cninja_state,mutantf) UINT32 cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = screen.machine().driver_data()->generic_space(); + address_space &space = machine().driver_data()->generic_space(); UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff); UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff); @@ -260,10 +260,10 @@ UINT32 cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 & /* Draw playfields */ bitmap.fill(0x400, cliprect); /* Confirmed */ - screen.machine().device<decospr_device>("spritegen1")->set_alt_format(true); - screen.machine().device<decospr_device>("spritegen2")->set_alt_format(true); - screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true); - screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true); + machine().device<decospr_device>("spritegen1")->set_alt_format(true); + machine().device<decospr_device>("spritegen2")->set_alt_format(true); + machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true); + machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true); /* There is no priority prom on this board, but there is a @@ -284,13 +284,13 @@ UINT32 cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 & if (priority & 1) { - screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff); - screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer? + machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff); + machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer? } else { - screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer? - screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff); + machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer? + machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff); } deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); return 0; |