From a32810d97465ae077ece35984a98a92abbf3462f Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sat, 26 Jun 2021 12:39:23 +0200 Subject: galaga.cpp and related: removed a few VIDEO_START_OVERRIDEs --- src/mame/drivers/galaga.cpp | 8 -------- src/mame/includes/bosco.h | 8 ++++++-- src/mame/includes/digdug.h | 6 ++++-- src/mame/includes/galaga.h | 2 +- src/mame/includes/xevious.h | 10 +++++----- src/mame/video/bosco.cpp | 2 +- src/mame/video/digdug.cpp | 2 +- src/mame/video/galaga.cpp | 2 +- src/mame/video/xevious.cpp | 2 +- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 5f90d0a126c..3e086ca8fde 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -1657,8 +1657,6 @@ void bosco_state::bosco(machine_config &config) STARFIELD_05XX(config, m_starfield, 0); m_starfield->set_starfield_config(0, STARFIELD_Y_OFFSET_BOSCO, STARFIELD_X_LIMIT_BOSCO); - MCFG_VIDEO_START_OVERRIDE(bosco_state,bosco) - /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1736,8 +1734,6 @@ void galaga_state::galaga(machine_config &config) STARFIELD_05XX(config, m_starfield, 0); m_starfield->set_starfield_config(STARFIELD_X_OFFSET_GALAGA, 0, STARFIELD_X_LIMIT_GALAGA); - MCFG_VIDEO_START_OVERRIDE(galaga_state,galaga) - /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1851,8 +1847,6 @@ void xevious_state::xevious(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_xevious); PALETTE(config, m_palette, FUNC(xevious_state::xevious_palette), 128*4 + 64*8 + 64*2, 128+1); - MCFG_VIDEO_START_OVERRIDE(xevious_state,xevious) - /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1971,8 +1965,6 @@ void digdug_state::digdug(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_digdug); PALETTE(config, m_palette, FUNC(digdug_state::digdug_palette), 16*2 + 64*4 + 64*4, 32); - MCFG_VIDEO_START_OVERRIDE(digdug_state,digdug) - /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h index 439e142dcd2..b4f5946c4d4 100644 --- a/src/mame/includes/bosco.h +++ b/src/mame/includes/bosco.h @@ -18,6 +18,12 @@ public: { } + void bosco(machine_config &config); + +protected: + virtual void video_start() override; + +private: required_shared_ptr m_bosco_radarattr; required_shared_ptr m_bosco_starcontrol; @@ -33,7 +39,6 @@ public: TILEMAP_MAPPER_MEMBER(fg_tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); - DECLARE_VIDEO_START(bosco); void bosco_palette(palette_device &palette) const; uint32_t screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_bosco); @@ -46,7 +51,6 @@ public: void bosco_scrollx_w(uint8_t data); void bosco_scrolly_w(uint8_t data); void bosco_starclr_w(uint8_t data); - void bosco(machine_config &config); void bosco_map(address_map &map); }; diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h index 11b061a204f..63183de3de0 100644 --- a/src/mame/includes/digdug.h +++ b/src/mame/includes/digdug.h @@ -22,6 +22,10 @@ public: void dzigzag(machine_config &config); void digdug(machine_config &config); +protected: + virtual void machine_start() override; + virtual void video_start() override; + private: required_device m_earom; required_shared_ptr m_digdug_objram; @@ -36,7 +40,6 @@ private: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); - DECLARE_VIDEO_START(digdug); void digdug_palette(palette_device &palette) const; uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -48,7 +51,6 @@ private: uint8_t earom_read(); void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); - virtual void machine_start() override; void digdug_map(address_map &map); }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index b3b082b906c..751c440fa19 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -55,7 +55,6 @@ public: void init_gatsbee(); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_VIDEO_START(galaga); void galaga_palette(palette_device &palette) const; uint32_t screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_galaga); @@ -75,6 +74,7 @@ public: protected: virtual void machine_start() override; virtual void machine_reset() override; + virtual void video_start() override; /* memory pointers, devices */ optional_shared_ptr m_videoram; diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h index 43ca36e9570..8f26e9abdfe 100644 --- a/src/mame/includes/xevious.h +++ b/src/mame/includes/xevious.h @@ -31,6 +31,8 @@ public: void init_xevios(); protected: + virtual void video_start() override; + required_shared_ptr m_xevious_sr1; required_shared_ptr m_xevious_sr2; required_shared_ptr m_xevious_sr3; @@ -39,14 +41,13 @@ protected: required_shared_ptr m_xevious_fg_videoram; required_shared_ptr m_xevious_bg_videoram; optional_device m_samples; + optional_device m_subcpu3; int32_t m_xevious_bs[2]; TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_VIDEO_START(xevious); void xevious_palette(palette_device &palette) const; - DECLARE_MACHINE_RESET(xevios); uint32_t screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void xevious_fg_videoram_w(offs_t offset, uint8_t data); @@ -57,8 +58,6 @@ protected: void xevious_bs_w(offs_t offset, uint8_t data); uint8_t xevious_bb_r(offs_t offset); - optional_device m_subcpu3; - void xevious_map(address_map &map); }; @@ -76,8 +75,9 @@ public: void battles(machine_config &config); protected: - void machine_reset() override; + virtual void machine_reset() override; +private: DECLARE_WRITE_LINE_MEMBER(interrupt_4); TIMER_DEVICE_CALLBACK_MEMBER(nmi_generate); diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp index 3b5cb1b7264..04f064f7f33 100644 --- a/src/mame/video/bosco.cpp +++ b/src/mame/video/bosco.cpp @@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(bosco_state::fg_get_tile_info ) ***************************************************************************/ -VIDEO_START_MEMBER(bosco_state,bosco) +void bosco_state::video_start() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bosco_state::bg_get_tile_info)), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bosco_state::fg_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(bosco_state::fg_tilemap_scan)), 8,8, 8,32); diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp index 336a76f6815..deebb52e94a 100644 --- a/src/mame/video/digdug.cpp +++ b/src/mame/video/digdug.cpp @@ -139,7 +139,7 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(digdug_state,digdug) +void digdug_state::video_start() { m_bg_select = 0; m_tx_color_mode = 0; diff --git a/src/mame/video/galaga.cpp b/src/mame/video/galaga.cpp index 461a5d32eba..ac5a946a1c9 100644 --- a/src/mame/video/galaga.cpp +++ b/src/mame/video/galaga.cpp @@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(galaga_state,galaga) +void galaga_state::video_start() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(galaga_state::get_tile_info)), tilemap_mapper_delegate(*this, FUNC(galaga_state::tilemap_scan)), 8,8,36,28); m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x1f); diff --git a/src/mame/video/xevious.cpp b/src/mame/video/xevious.cpp index 4f1abe9ea6e..a47a58682a4 100644 --- a/src/mame/video/xevious.cpp +++ b/src/mame/video/xevious.cpp @@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(xevious_state,xevious) +void xevious_state::video_start() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(xevious_state::get_bg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(xevious_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); -- cgit v1.2.3