From f94f97270d408a02c3d6ce26d5ad7f539fde5e77 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Thu, 1 Jun 2017 21:15:23 +0200 Subject: exidy440.cpp: partial revert of timer_set removal. This needs to be studied better. (nw) --- src/mame/includes/exidy440.h | 1 - src/mame/video/exidy440.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 185ad52e7ab..19b27b622f5 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -48,7 +48,6 @@ public: uint8_t m_firq_select; uint8_t m_palettebank_io; uint8_t m_palettebank_vis; - emu_timer *m_beam_firq_timer; emu_timer *m_collide_firq_timer; DECLARE_WRITE8_MEMBER(bankram_w); DECLARE_READ8_MEMBER(exidy440_input_port_3_r); diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index 7a405a48ec3..b02b8c4cc4a 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -52,7 +52,6 @@ VIDEO_START_MEMBER(exidy440_state,exidy440) memset(m_local_paletteram.get(), 0, 512 * 2); m_collide_firq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exidy440_state::collide_firq_callback), this)); - m_beam_firq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exidy440_state::beam_firq_callback), this)); } @@ -433,7 +432,7 @@ uint32_t exidy440_state::screen_update_exidy440(screen_device &screen, bitmap_in attotime time = screen.time_until_pos(beamy, beamx) - increment * 6; for (i = 0; i <= 12; i++) { - m_beam_firq_timer->adjust(time, beamx); + machine().scheduler().timer_set(time, timer_expired_delegate(FUNC(exidy440_state::beam_firq_callback),this), beamx); time += increment; } } -- cgit v1.2.3