diff options
Diffstat (limited to 'src/mame/includes/lethalj.h')
-rw-r--r-- | src/mame/includes/lethalj.h | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index be98fb58805..32d840c7e32 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -23,8 +23,8 @@ public: TIMER_GEN_EXT1_INT }; - lethalj_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , + lethalj_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), m_ticket(*this, "ticket"), @@ -32,27 +32,10 @@ public: m_light0_x(*this, "LIGHT0_X"), m_light0_y(*this, "LIGHT0_Y"), m_light1_x(*this, "LIGHT1_X"), - m_light1_y(*this, "LIGHT1_Y") + m_light1_y(*this, "LIGHT1_Y"), + m_lamp(*this, "lamp%u", 0U) { } - required_device<tms34010_device> m_maincpu; - required_device<screen_device> m_screen; - required_device<ticket_dispenser_device> m_ticket; - optional_ioport m_paddle; - optional_ioport m_light0_x; - optional_ioport m_light0_y; - optional_ioport m_light1_x; - optional_ioport m_light1_y; - - emu_timer *m_gen_ext1_int_timer; - uint16_t m_blitter_data[8]; - std::unique_ptr<uint16_t[]> m_screenram; - uint8_t m_vispage; - uint16_t *m_blitter_base; - int m_blitter_rows; - uint16_t m_gunx; - uint16_t m_guny; - uint8_t m_blank_palette; DECLARE_WRITE16_MEMBER(ripribit_control_w); DECLARE_WRITE16_MEMBER(cfarm_control_w); DECLARE_WRITE16_MEMBER(cclownz_control_w); @@ -63,7 +46,6 @@ public: void init_cfarm(); void init_ripribit(); void init_cclownz(); - virtual void video_start() override; inline void get_crosshair_xy(int player, int *x, int *y); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); @@ -71,7 +53,29 @@ public: void gameroom(machine_config &config); void lethalj_map(address_map &map); protected: + virtual void machine_start() override { m_lamp.resolve(); } virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void video_start() override; + + required_device<tms34010_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<ticket_dispenser_device> m_ticket; + optional_ioport m_paddle; + optional_ioport m_light0_x; + optional_ioport m_light0_y; + optional_ioport m_light1_x; + optional_ioport m_light1_y; + output_finder<3> m_lamp; + + emu_timer *m_gen_ext1_int_timer; + uint16_t m_blitter_data[8]; + std::unique_ptr<uint16_t[]> m_screenram; + uint8_t m_vispage; + uint16_t *m_blitter_base; + int m_blitter_rows; + uint16_t m_gunx; + uint16_t m_guny; + uint8_t m_blank_palette; }; #endif // MAME_INCLUDES_LETHALJ_H |