summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/tank8.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/tank8.h')
-rw-r--r--src/mame/includes/tank8.h59
1 files changed, 34 insertions, 25 deletions
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 0ae4bc03d91..9666cd6cde1 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -5,6 +5,10 @@
Atari tank8 hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_TANK8_H
+#define MAME_INCLUDES_TANK8_H
+
+#pragma once
#include "sound/discrete.h"
#include "screen.h"
@@ -34,8 +38,8 @@ public:
TIMER_COLLISION
};
- tank8_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ tank8_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_discrete(*this, "discrete"),
m_gfxdecode(*this, "gfxdecode"),
@@ -45,27 +49,13 @@ public:
m_pos_h_ram(*this, "pos_h_ram"),
m_pos_v_ram(*this, "pos_v_ram"),
m_pos_d_ram(*this, "pos_d_ram"),
- m_team(*this, "team") { }
-
- required_device<cpu_device> m_maincpu;
- required_device<discrete_device> m_discrete;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<screen_device> m_screen;
- required_device<palette_device> m_palette;
-
- required_shared_ptr<uint8_t> m_video_ram;
- required_shared_ptr<uint8_t> m_pos_h_ram;
- required_shared_ptr<uint8_t> m_pos_v_ram;
- required_shared_ptr<uint8_t> m_pos_d_ram;
- required_shared_ptr<uint8_t> m_team;
+ m_team(*this, "team")
+ { }
- int m_collision_index;
- tilemap_t *m_tilemap;
- bitmap_ind16 m_helper1;
- bitmap_ind16 m_helper2;
- bitmap_ind16 m_helper3;
- emu_timer *m_collision_timer;
+ DECLARE_DRIVER_INIT(decode);
+ void tank8(machine_config &config);
+protected:
DECLARE_READ8_MEMBER(collision_r);
DECLARE_WRITE8_MEMBER(lockout_w);
DECLARE_WRITE8_MEMBER(int_reset_w);
@@ -79,7 +69,6 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info);
- DECLARE_DRIVER_INIT(decode);
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(tank8);
@@ -93,12 +82,32 @@ public:
void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect);
void set_collision(int index);
- void tank8(machine_config &config);
- void tank8_cpu_map(address_map &map);
-protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ void tank8_cpu_map(address_map &map);
+
+private:
+ required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<screen_device> m_screen;
+ required_device<palette_device> m_palette;
+
+ required_shared_ptr<uint8_t> m_video_ram;
+ required_shared_ptr<uint8_t> m_pos_h_ram;
+ required_shared_ptr<uint8_t> m_pos_v_ram;
+ required_shared_ptr<uint8_t> m_pos_d_ram;
+ required_shared_ptr<uint8_t> m_team;
+
+ int m_collision_index;
+ tilemap_t *m_tilemap;
+ bitmap_ind16 m_helper1;
+ bitmap_ind16 m_helper2;
+ bitmap_ind16 m_helper3;
+ emu_timer *m_collision_timer;
};
/*----------- defined in audio/tank8.c -----------*/
DISCRETE_SOUND_EXTERN( tank8 );
+
+#endif // MAME_INCLUDES_TANK8_H