diff options
Diffstat (limited to 'src/mame/video/wiz.c')
-rw-r--r-- | src/mame/video/wiz.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c index df558670b99..edd82a1473e 100644 --- a/src/mame/video/wiz.c +++ b/src/mame/video/wiz.c @@ -201,45 +201,42 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, } -SCREEN_UPDATE_IND16( kungfut ) +UINT32 wiz_state::screen_update_kungfut(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - wiz_state *state = screen.machine().driver_data<wiz_state>(); - bitmap.fill(state->m_bgpen, cliprect); - draw_background(screen.machine(), bitmap, cliprect, 2 + state->m_char_bank[0] , 0); + bitmap.fill(m_bgpen, cliprect); + draw_background(screen.machine(), bitmap, cliprect, 2 + m_char_bank[0] , 0); draw_foreground(screen.machine(), bitmap, cliprect, 0); - draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram2, 4); - draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram , 5); + draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2, 4); + draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram , 5); return 0; } -SCREEN_UPDATE_IND16( wiz ) +UINT32 wiz_state::screen_update_wiz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - wiz_state *state = screen.machine().driver_data<wiz_state>(); int bank; - bitmap.fill(state->m_bgpen, cliprect); - draw_background(screen.machine(), bitmap, cliprect, 2 + ((state->m_char_bank[0] << 1) | state->m_char_bank[1]), 0); + bitmap.fill(m_bgpen, cliprect); + draw_background(screen.machine(), bitmap, cliprect, 2 + ((m_char_bank[0] << 1) | m_char_bank[1]), 0); draw_foreground(screen.machine(), bitmap, cliprect, 0); const rectangle spritevisiblearea(2*8, 32*8-1, 2*8, 30*8-1); const rectangle spritevisibleareaflipx(0*8, 30*8-1, 2*8, 30*8-1); - const rectangle &visible_area = state->m_flipx ? spritevisibleareaflipx : spritevisiblearea; + const rectangle &visible_area = m_flipx ? spritevisibleareaflipx : spritevisiblearea; - bank = 7 + *state->m_sprite_bank; + bank = 7 + *m_sprite_bank; - draw_sprites(screen.machine(), bitmap, visible_area, state->m_spriteram2, 6); - draw_sprites(screen.machine(), bitmap, visible_area, state->m_spriteram , bank); + draw_sprites(screen.machine(), bitmap, visible_area, m_spriteram2, 6); + draw_sprites(screen.machine(), bitmap, visible_area, m_spriteram , bank); return 0; } -SCREEN_UPDATE_IND16( stinger ) +UINT32 wiz_state::screen_update_stinger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - wiz_state *state = screen.machine().driver_data<wiz_state>(); - bitmap.fill(state->m_bgpen, cliprect); - draw_background(screen.machine(), bitmap, cliprect, 2 + state->m_char_bank[0], 1); + bitmap.fill(m_bgpen, cliprect); + draw_background(screen.machine(), bitmap, cliprect, 2 + m_char_bank[0], 1); draw_foreground(screen.machine(), bitmap, cliprect, 1); - draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram2, 4); - draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram , 5); + draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2, 4); + draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram , 5); return 0; } |