diff options
author | 2019-09-20 00:28:19 +1000 | |
---|---|---|
committer | 2019-09-20 00:28:19 +1000 | |
commit | dac7094f3431b8f933497b0c7693e6baeb1bb75c (patch) | |
tree | 1c3dc049110c54d23dc31a1e6c1e8b11fd24e299 /src/mame/drivers/jclub2.cpp | |
parent | cc25024f791747fa17c1f06bd81c482a86aac91b (diff) |
(nw) misc cleanup:
* get rid of most assert_always
* get rid of a few MCFG_*_OVERRIDE
Diffstat (limited to 'src/mame/drivers/jclub2.cpp')
-rw-r--r-- | src/mame/drivers/jclub2.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 75a13ac9a58..fbbfde0d7a2 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -114,6 +114,8 @@ #include "jclub2o.lh" #include "jclub2.lh" +namespace { + // Common between all hardware (jclub2o, jclub2 and darkhors) class common_state : public driver_device { @@ -235,6 +237,14 @@ public: m_gfxdecode(*this, "gfxdecode") { } + void init_darkhors(); + + void darkhors(machine_config &config); + +protected: + virtual void video_start() override; + +private: DECLARE_WRITE32_MEMBER(input_sel_w); DECLARE_READ32_MEMBER(input_r); DECLARE_WRITE32_MEMBER(out1_w); @@ -248,12 +258,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - void init_darkhors(); - DECLARE_VIDEO_START(darkhors); - - void darkhors(machine_config &config); void darkhors_map(address_map &map); -private: + required_shared_ptr<uint32_t> m_tmapram; required_shared_ptr<uint32_t> m_tmapscroll; required_shared_ptr<uint32_t> m_tmapram2; @@ -391,8 +397,10 @@ void darkhors_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec } } -VIDEO_START_MEMBER(darkhors_state,darkhors) +void darkhors_state::video_start() { + common_state::video_start(); + m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); m_tmap2= &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); m_tmap->set_transparent_pen(0); @@ -1232,7 +1240,6 @@ void darkhors_state::darkhors(machine_config &config) PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x10000); GFXDECODE(config, m_gfxdecode, m_palette, gfx_darkhors); - MCFG_VIDEO_START_OVERRIDE(darkhors_state, darkhors) // layout config.set_default_layout(layout_jclub2); @@ -1531,6 +1538,8 @@ void darkhors_state::init_darkhors() } } +} // anonymous namespace + // Older hardware (ST-0020 + ST-0016) GAME( 1994, jclub2v100, jclub2v112, jclub2o, jclub2v100, jclub2o_state, init_jclub2o, ROT0, "Seta", "Jockey Club II (v1.00, older hardware)", MACHINE_IMPERFECT_GRAPHICS ) |