diff options
Diffstat (limited to 'src/mame/includes/fitfight.h')
-rw-r--r-- | src/mame/includes/fitfight.h | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index a3789e47cfc..36fb509c68b 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -1,13 +1,17 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_FITFIGHT_H +#define MAME_INCLUDES_FITFIGHT_H + +#pragma once #include "emupal.h" class fitfight_state : public driver_device { public: - fitfight_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + fitfight_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_fof_100000(*this, "fof_100000"), m_fof_600000(*this, "fof_600000"), m_fof_700000(*this, "fof_700000"), @@ -19,8 +23,10 @@ public: m_fof_txt_tileram(*this, "fof_txt_tileram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void bbprot(machine_config &config); void fitfight(machine_config &config); @@ -31,26 +37,6 @@ public: void init_bbprot(); private: - /* memory pointers */ - required_shared_ptr<uint16_t> m_fof_100000; - required_shared_ptr<uint16_t> m_fof_600000; - required_shared_ptr<uint16_t> m_fof_700000; - required_shared_ptr<uint16_t> m_fof_800000; - required_shared_ptr<uint16_t> m_fof_900000; - required_shared_ptr<uint16_t> m_fof_a00000; - required_shared_ptr<uint16_t> m_fof_bak_tileram; - required_shared_ptr<uint16_t> m_fof_mid_tileram; - required_shared_ptr<uint16_t> m_fof_txt_tileram; - required_shared_ptr<uint16_t> m_spriteram; - - /* video-related */ - tilemap_t *m_fof_bak_tilemap; - tilemap_t *m_fof_mid_tilemap; - tilemap_t *m_fof_txt_tilemap; - - /* misc */ - int m_bbprot_kludge; - uint16_t m_fof_700000_data; DECLARE_READ16_MEMBER(fitfight_700000_r); DECLARE_READ16_MEMBER(histryma_700000_r); DECLARE_READ16_MEMBER(bbprot_700000_r); @@ -73,12 +59,36 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_fitfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(snd_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ); - required_device<cpu_device> m_maincpu; - required_device<gfxdecode_device> m_gfxdecode; - required_device<palette_device> m_palette; void bbprot_main_map(address_map &map); void fitfight_main_map(address_map &map); void snd_mem(address_map &map); + + // memory pointers + required_shared_ptr<uint16_t> m_fof_100000; + required_shared_ptr<uint16_t> m_fof_600000; + required_shared_ptr<uint16_t> m_fof_700000; + required_shared_ptr<uint16_t> m_fof_800000; + required_shared_ptr<uint16_t> m_fof_900000; + required_shared_ptr<uint16_t> m_fof_a00000; + required_shared_ptr<uint16_t> m_fof_bak_tileram; + required_shared_ptr<uint16_t> m_fof_mid_tileram; + required_shared_ptr<uint16_t> m_fof_txt_tileram; + required_shared_ptr<uint16_t> m_spriteram; + + // video-related + tilemap_t *m_fof_bak_tilemap; + tilemap_t *m_fof_mid_tilemap; + tilemap_t *m_fof_txt_tilemap; + + // misc + int m_bbprot_kludge; + uint16_t m_fof_700000_data; + + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; + +#endif // MAME_INCLUDES_FITFIGHT_H |