summaryrefslogtreecommitdiffstats
path: root/src/mame/includes/funworld.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/funworld.h')
-rw-r--r--src/mame/includes/funworld.h25
1 files changed, 16 insertions, 9 deletions
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 0c39ac93bdd..7bc574e8422 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -3,17 +3,16 @@
class funworld_state : public driver_device
{
public:
- funworld_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ funworld_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette"),
+ m_lamp(*this, "lamp%u", 0U)
+ { }
- required_shared_ptr<uint8_t> m_videoram;
- required_shared_ptr<uint8_t> m_colorram;
- tilemap_t *m_bg_tilemap;
DECLARE_READ8_MEMBER(questions_r);
DECLARE_WRITE8_MEMBER(question_bank_w);
DECLARE_WRITE8_MEMBER(funworld_videoram_w);
@@ -44,9 +43,6 @@ public:
DECLARE_MACHINE_START(lunapark);
DECLARE_MACHINE_RESET(lunapark);
uint32_t screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- required_device<cpu_device> m_maincpu;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
void royalcd1(machine_config &config);
void royalcd2(machine_config &config);
void fw1stpal(machine_config &config);
@@ -71,4 +67,15 @@ public:
void magicrd2_map(address_map &map);
void saloon_map(address_map &map);
void witchryl_map(address_map &map);
+
+protected:
+ virtual void machine_start() override { m_lamp.resolve(); }
+
+ required_shared_ptr<uint8_t> m_videoram;
+ required_shared_ptr<uint8_t> m_colorram;
+ tilemap_t *m_bg_tilemap;
+ required_device<cpu_device> m_maincpu;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
+ output_finder<8> m_lamp;
};