diff options
Diffstat (limited to 'src/mame/video/nova2001.c')
-rw-r--r-- | src/mame/video/nova2001.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index af5c1576a48..bbd6eee64c6 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -339,55 +339,51 @@ static void pkunwar_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, -SCREEN_UPDATE_IND16( nova2001 ) +UINT32 nova2001_state::screen_update_nova2001(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - nova2001_state *state = screen.machine().driver_data<nova2001_state>(); - state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + m_bg_tilemap->draw(bitmap, cliprect, 0, 0); nova2001_draw_sprites(screen.machine(), bitmap, cliprect); // according to the schematics, fg category 0 should be drawn behind sprites, // but it doesn't look right that way - state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); - state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); + m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + m_fg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } -SCREEN_UPDATE_IND16( pkunwar ) +UINT32 nova2001_state::screen_update_pkunwar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - nova2001_state *state = screen.machine().driver_data<nova2001_state>(); - state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); + m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); pkunwar_draw_sprites(screen.machine(), bitmap, cliprect); - state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); + m_bg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } -SCREEN_UPDATE_IND16( ninjakun ) +UINT32 nova2001_state::screen_update_ninjakun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - nova2001_state *state = screen.machine().driver_data<nova2001_state>(); - state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + m_bg_tilemap->draw(bitmap, cliprect, 0, 0); - state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); + m_fg_tilemap->draw(bitmap, cliprect, 1, 0); nova2001_draw_sprites(screen.machine(), bitmap, cliprect); - state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } -SCREEN_UPDATE_IND16( raiders5 ) +UINT32 nova2001_state::screen_update_raiders5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - nova2001_state *state = screen.machine().driver_data<nova2001_state>(); - state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + m_bg_tilemap->draw(bitmap, cliprect, 0, 0); pkunwar_draw_sprites(screen.machine(), bitmap, cliprect); - state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } |