diff options
Diffstat (limited to 'src/mame/includes/lordgun.h')
-rw-r--r-- | src/mame/includes/lordgun.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index b11a612f6a9..57b28249f28 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -20,8 +20,8 @@ struct lordgun_gun_data class lordgun_state : public driver_device { public: - lordgun_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lordgun_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_oki(*this, "oki"), @@ -31,7 +31,6 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), m_soundlatch2(*this, "soundlatch2"), - m_generic_paletteram_16(*this, "paletteram"), m_priority_ram(*this, "priority_ram"), m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), @@ -56,7 +55,6 @@ private: required_device<generic_latch_8_device> m_soundlatch; required_device<generic_latch_8_device> m_soundlatch2; - required_shared_ptr<uint16_t> m_generic_paletteram_16; required_shared_ptr<uint16_t> m_priority_ram; required_shared_ptr<uint16_t> m_scrollram; required_shared_ptr<uint16_t> m_spriteram; @@ -78,17 +76,13 @@ private: DECLARE_WRITE16_MEMBER(aliencha_protection_w); DECLARE_READ16_MEMBER(aliencha_protection_r); - DECLARE_WRITE16_MEMBER(lordgun_priority_w); + DECLARE_WRITE16_MEMBER(priority_w); DECLARE_READ16_MEMBER(lordgun_gun_0_x_r); DECLARE_READ16_MEMBER(lordgun_gun_0_y_r); DECLARE_READ16_MEMBER(lordgun_gun_1_x_r); DECLARE_READ16_MEMBER(lordgun_gun_1_y_r); - DECLARE_WRITE16_MEMBER(lordgun_soundlatch_w); - DECLARE_WRITE16_MEMBER(lordgun_paletteram_w); - DECLARE_WRITE16_MEMBER(lordgun_vram_0_w); - DECLARE_WRITE16_MEMBER(lordgun_vram_1_w); - DECLARE_WRITE16_MEMBER(lordgun_vram_2_w); - DECLARE_WRITE16_MEMBER(lordgun_vram_3_w); + DECLARE_WRITE16_MEMBER(soundlatch_w); + template<int Layer> DECLARE_WRITE16_MEMBER(vram_w); DECLARE_WRITE8_MEMBER(fake_w); DECLARE_WRITE8_MEMBER(fake2_w); DECLARE_WRITE8_MEMBER(lordgun_eeprom_w); @@ -97,25 +91,21 @@ private: DECLARE_WRITE8_MEMBER(aliencha_dip_w); DECLARE_WRITE8_MEMBER(lordgun_okibank_w); - TILE_GET_INFO_MEMBER(get_tile_info_0); - TILE_GET_INFO_MEMBER(get_tile_info_1); - TILE_GET_INFO_MEMBER(get_tile_info_2); - TILE_GET_INFO_MEMBER(get_tile_info_3); + template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start() override; virtual void video_start() override; - uint32_t screen_update_lordgun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - inline void get_tile_info(tile_data &tileinfo, tilemap_memory_index tile_index, int _N_); - inline void lordgun_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask, int _N_); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void lorddgun_calc_gun_scr(int i); void lordgun_update_gun(int i); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void aliencha_map(address_map &map); void aliencha_soundio_map(address_map &map); + void common_map(address_map &map); void lordgun_map(address_map &map); void lordgun_soundio_map(address_map &map); - void lordgun_soundmem_map(address_map &map); + void soundmem_map(address_map &map); void ymf278_map(address_map &map); }; |