diff options
Diffstat (limited to 'src/mame/video/wrally.c')
-rw-r--r-- | src/mame/video/wrally.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 9efc4ecfb27..e6ed72a0dfb 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -173,33 +173,32 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r ***************************************************************************/ -SCREEN_UPDATE_IND16( wrally ) +UINT32 wrally_state::screen_update_wrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - wrally_state *state = screen.machine().driver_data<wrally_state>(); /* set scroll registers */ - if (!state->flip_screen()) { - state->m_pant[0]->set_scrolly(0, state->m_vregs[0]); - state->m_pant[0]->set_scrollx(0, state->m_vregs[1]+4); - state->m_pant[1]->set_scrolly(0, state->m_vregs[2]); - state->m_pant[1]->set_scrollx(0, state->m_vregs[3]); + if (!flip_screen()) { + m_pant[0]->set_scrolly(0, m_vregs[0]); + m_pant[0]->set_scrollx(0, m_vregs[1]+4); + m_pant[1]->set_scrolly(0, m_vregs[2]); + m_pant[1]->set_scrollx(0, m_vregs[3]); } else { - state->m_pant[0]->set_scrolly(0, 248 - state->m_vregs[0]); - state->m_pant[0]->set_scrollx(0, 1024 - state->m_vregs[1] - 4); - state->m_pant[1]->set_scrolly(0, 248 - state->m_vregs[2]); - state->m_pant[1]->set_scrollx(0, 1024 - state->m_vregs[3]); + m_pant[0]->set_scrolly(0, 248 - m_vregs[0]); + m_pant[0]->set_scrollx(0, 1024 - m_vregs[1] - 4); + m_pant[1]->set_scrolly(0, 248 - m_vregs[2]); + m_pant[1]->set_scrollx(0, 1024 - m_vregs[3]); } /* draw tilemaps + sprites */ - state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); - state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER0,0); - state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER1,0); + m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER0,0); + m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER1,0); - state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0); - state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER0,0); + m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0); + m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER0,0); draw_sprites(screen.machine(),bitmap,cliprect,0); - state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER1,0); + m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER1,0); draw_sprites(screen.machine(),bitmap,cliprect,1); |