summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/funworld.h
diff options
context:
space:
mode:
author David Haywood <hazemamewip@hotmail.com>2018-06-27 14:32:24 +0100
committer hap <happppp@users.noreply.github.com>2018-06-27 15:32:24 +0200
commit6d6b562ffd0168791e9d8d363a07063e7090c0c6 (patch)
tree934c34bdc531c611fbf26d94bf58974510eeea2d /src/mame/includes/funworld.h
parent8aa76c10113d44ab20e242ebdc4f2f69bc77b719 (diff)
more private member use in 'D, E, F, G' drivers (nw) (#3704)
* more private member use in 'D' drivers (nw) * same for 'E' drivers (nw) * and 'F' (nw) * 'G' (nw) (left galaxian/galaxold alone because I know somebody is looking at them)
Diffstat (limited to 'src/mame/includes/funworld.h')
-rw-r--r--src/mame/includes/funworld.h64
1 files changed, 35 insertions, 29 deletions
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 4aa1c47fb47..1ff9958de2a 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -16,16 +16,20 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
- DECLARE_READ8_MEMBER(questions_r);
- DECLARE_WRITE8_MEMBER(question_bank_w);
- DECLARE_WRITE8_MEMBER(funworld_videoram_w);
- DECLARE_WRITE8_MEMBER(funworld_colorram_w);
- DECLARE_WRITE8_MEMBER(funworld_lamp_a_w);
- DECLARE_WRITE8_MEMBER(funworld_lamp_b_w);
- DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w);
- DECLARE_READ8_MEMBER(funquiz_ay8910_a_r);
- DECLARE_READ8_MEMBER(funquiz_ay8910_b_r);
- DECLARE_READ8_MEMBER(chinatow_r_32f0);
+ void royalcd1(machine_config &config);
+ void royalcd2(machine_config &config);
+ void fw1stpal(machine_config &config);
+ void chinatow(machine_config &config);
+ void magicrd2(machine_config &config);
+ void fw_a7_11(machine_config &config);
+ void fw2ndpal(machine_config &config);
+ void saloon(machine_config &config);
+ void cuoreuno(machine_config &config);
+ void funquiz(machine_config &config);
+ void rcdino4(machine_config &config);
+ void intrgmes(machine_config &config);
+ void witchryl(machine_config &config);
+
void init_magicd2b();
void init_magicd2c();
void init_saloon();
@@ -38,39 +42,41 @@ public:
void init_ctunk();
void init_rcdino4();
void init_rcdinch();
- TILE_GET_INFO_MEMBER(get_bg_tile_info);
+
+ DECLARE_WRITE8_MEMBER(funworld_videoram_w);
+ DECLARE_WRITE8_MEMBER(funworld_colorram_w);
+
+protected:
+ virtual void machine_start() override { m_lamps.resolve(); }
DECLARE_VIDEO_START(funworld);
DECLARE_PALETTE_INIT(funworld);
+ uint32_t screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ void lunapark_map(address_map &map);
+
+private:
+ DECLARE_READ8_MEMBER(questions_r);
+ DECLARE_WRITE8_MEMBER(question_bank_w);
+ DECLARE_WRITE8_MEMBER(funworld_lamp_a_w);
+ DECLARE_WRITE8_MEMBER(funworld_lamp_b_w);
+ DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w);
+ DECLARE_READ8_MEMBER(funquiz_ay8910_a_r);
+ DECLARE_READ8_MEMBER(funquiz_ay8910_b_r);
+ DECLARE_READ8_MEMBER(chinatow_r_32f0);
+
+ TILE_GET_INFO_MEMBER(get_bg_tile_info);
DECLARE_VIDEO_START(magicrd2);
DECLARE_VIDEO_START(chinatow);
- uint32_t screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void royalcd1(machine_config &config);
- void royalcd2(machine_config &config);
- void fw1stpal(machine_config &config);
- void chinatow(machine_config &config);
- void magicrd2(machine_config &config);
- void fw_a7_11(machine_config &config);
- void fw2ndpal(machine_config &config);
- void saloon(machine_config &config);
- void cuoreuno(machine_config &config);
- void funquiz(machine_config &config);
- void rcdino4(machine_config &config);
- void intrgmes(machine_config &config);
- void witchryl(machine_config &config);
void chinatow_map(address_map &map);
void cuoreuno_map(address_map &map);
void funquiz_map(address_map &map);
void funworld_map(address_map &map);
void fw_a7_11_map(address_map &map);
void intergames_map(address_map &map);
- void lunapark_map(address_map &map);
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_lamps.resolve(); }
-
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
tilemap_t *m_bg_tilemap;