summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/funworld.h
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/includes/funworld.h
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/includes/funworld.h')
-rw-r--r--src/mame/includes/funworld.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index aef6b4fb31b..d2e631f97e1 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,7 +53,6 @@ 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;
@@ -74,6 +73,7 @@ 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;
};