summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/warriorb.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/warriorb.h')
-rw-r--r--src/mame/includes/warriorb.h31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h
index 1028e6f6b86..e1b12476c39 100644
--- a/src/mame/includes/warriorb.h
+++ b/src/mame/includes/warriorb.h
@@ -18,9 +18,7 @@ class warriorb_state : public driver_device
public:
warriorb_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu"),
m_tc0140syt(*this, "tc0140syt"),
m_tc0100scn_1(*this, "tc0100scn_1"),
m_tc0100scn_2(*this, "tc0100scn_2"),
@@ -33,17 +31,11 @@ public:
m_2610_2l(*this, "2610.2.l"),
m_2610_2r(*this, "2610.2.r"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
-
- /* memory pointers */
- required_shared_ptr<UINT16> m_spriteram;
-
- /* misc */
- int m_pandata[4];
+ m_palette(*this, "palette"),
+ m_spriteram(*this, "spriteram") { }
/* devices */
required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_audiocpu;
required_device<tc0140syt_device> m_tc0140syt;
required_device<tc0100scn_device> m_tc0100scn_1;
required_device<tc0100scn_device> m_tc0100scn_2;
@@ -58,16 +50,23 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
+ /* memory pointers */
+ required_shared_ptr<UINT16> m_spriteram;
+
+ /* misc */
+ int m_pandata[4];
+
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
- DECLARE_WRITE16_MEMBER(warriorb_sound_w);
- DECLARE_READ16_MEMBER(warriorb_sound_r);
- DECLARE_WRITE8_MEMBER(warriorb_pancontrol);
+ DECLARE_WRITE16_MEMBER(sound_w);
+ DECLARE_READ16_MEMBER(sound_r);
+ DECLARE_WRITE8_MEMBER(pancontrol);
DECLARE_WRITE16_MEMBER(tc0100scn_dual_screen_w);
+
virtual void machine_start();
virtual void machine_reset();
- UINT32 screen_update_warriorb_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_warriorb_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ UINT32 screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ UINT32 screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int x_offs, int y_offs );
UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffs, tc0100scn_device *tc0100scn);
- DECLARE_WRITE_LINE_MEMBER(irqhandler);
};