diff options
Diffstat (limited to 'src/mame/includes/combatsc.h')
-rw-r--r-- | src/mame/includes/combatsc.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index d1f4f7baa6c..9aef51765a0 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -31,26 +31,26 @@ public: } /* memory pointers */ - UINT8 * m_videoram; - UINT8 * m_scrollram; - UINT8 * m_io_ram; - std::unique_ptr<UINT8[]> m_spriteram[2]; + uint8_t * m_videoram; + uint8_t * m_scrollram; + uint8_t * m_io_ram; + std::unique_ptr<uint8_t[]> m_spriteram[2]; /* video-related */ tilemap_t *m_bg_tilemap[2]; tilemap_t *m_textlayer; - UINT8 m_scrollram0[0x40]; - UINT8 m_scrollram1[0x40]; + uint8_t m_scrollram0[0x40]; + uint8_t m_scrollram1[0x40]; int m_priority; int m_vreg; int m_bank_select; /* 0x00..0x1f */ int m_video_circuit; /* 0 or 1 */ - UINT8 *m_page[2]; + uint8_t *m_page[2]; /* misc */ - UINT8 m_pos[4]; - UINT8 m_sign[4]; + uint8_t m_pos[4]; + uint8_t m_sign[4]; int m_prot[2]; int m_boost; emu_timer *m_interleave_timer; @@ -108,8 +108,8 @@ public: DECLARE_MACHINE_START(combatscb); DECLARE_VIDEO_START(combatscb); DECLARE_PALETTE_INIT(combatscb); - UINT32 screen_update_combatsc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - UINT32 screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *source, int circuit, bitmap_ind8 &priority_bitmap, UINT32 pri_mask ); - void bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *source, int circuit ); + uint32_t screen_update_combatsc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *source, int circuit, bitmap_ind8 &priority_bitmap, uint32_t pri_mask ); + void bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *source, int circuit ); }; |