diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/mame/includes/funworld.h | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/mame/includes/funworld.h')
-rw-r--r-- | src/mame/includes/funworld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index d2e631f97e1..aef6b4fb31b 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -12,10 +12,10 @@ class funworld_state : public driver_device public: funworld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), m_lamps(*this, "lamp%u", 0U) { } @@ -53,6 +53,7 @@ protected: void magicrd2_map(address_map &map); + required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap = nullptr; @@ -73,7 +74,6 @@ private: required_shared_ptr<uint8_t> m_videoram; required_shared_ptr<uint8_t> m_colorram; - required_device<cpu_device> m_maincpu; required_device<palette_device> m_palette; output_finder<8> m_lamps; }; |