diff options
Diffstat (limited to 'src/mame/includes/toaplan1.h')
-rw-r--r-- | src/mame/includes/toaplan1.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index e5366a7d123..ff437df03dc 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -24,10 +24,10 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette") { } - required_shared_ptr<UINT16> m_bgpaletteram; - required_shared_ptr<UINT16> m_fgpaletteram; + required_shared_ptr<uint16_t> m_bgpaletteram; + required_shared_ptr<uint16_t> m_fgpaletteram; - optional_shared_ptr<UINT8> m_sharedram; + optional_shared_ptr<uint8_t> m_sharedram; int m_coin_count; /* coin count increments on startup ? , so don't count it */ int m_intenable; @@ -36,37 +36,37 @@ public: int m_dsp_on; int m_dsp_BIO; int m_dsp_execute; - UINT32 m_dsp_addr_w; - UINT32 m_main_ram_seg; - - UINT8 m_vimana_coins[2]; - UINT8 m_vimana_credits; - UINT8 m_vimana_latch; - - std::unique_ptr<UINT16[]> m_pf4_tilevram16; /* || Drawn in this order */ - std::unique_ptr<UINT16[]> m_pf3_tilevram16; /* || */ - std::unique_ptr<UINT16[]> m_pf2_tilevram16; /* \||/ */ - std::unique_ptr<UINT16[]> m_pf1_tilevram16; /* \/ */ - - optional_shared_ptr<UINT16> m_spriteram; - std::unique_ptr<UINT16[]> m_buffered_spriteram; - std::unique_ptr<UINT16[]> m_spritesizeram16; - std::unique_ptr<UINT16[]> m_buffered_spritesizeram16; - - INT32 m_bcu_flipscreen; /* Tile controller flip flag */ - INT32 m_fcu_flipscreen; /* Sprite controller flip flag */ - - INT32 m_pf_voffs; - INT32 m_spriteram_offs; - - INT32 m_pf1_scrollx; - INT32 m_pf1_scrolly; - INT32 m_pf2_scrollx; - INT32 m_pf2_scrolly; - INT32 m_pf3_scrollx; - INT32 m_pf3_scrolly; - INT32 m_pf4_scrollx; - INT32 m_pf4_scrolly; + uint32_t m_dsp_addr_w; + uint32_t m_main_ram_seg; + + uint8_t m_vimana_coins[2]; + uint8_t m_vimana_credits; + uint8_t m_vimana_latch; + + std::unique_ptr<uint16_t[]> m_pf4_tilevram16; /* || Drawn in this order */ + std::unique_ptr<uint16_t[]> m_pf3_tilevram16; /* || */ + std::unique_ptr<uint16_t[]> m_pf2_tilevram16; /* \||/ */ + std::unique_ptr<uint16_t[]> m_pf1_tilevram16; /* \/ */ + + optional_shared_ptr<uint16_t> m_spriteram; + std::unique_ptr<uint16_t[]> m_buffered_spriteram; + std::unique_ptr<uint16_t[]> m_spritesizeram16; + std::unique_ptr<uint16_t[]> m_buffered_spritesizeram16; + + int32_t m_bcu_flipscreen; /* Tile controller flip flag */ + int32_t m_fcu_flipscreen; /* Sprite controller flip flag */ + + int32_t m_pf_voffs; + int32_t m_spriteram_offs; + + int32_t m_pf1_scrollx; + int32_t m_pf1_scrolly; + int32_t m_pf2_scrollx; + int32_t m_pf2_scrolly; + int32_t m_pf3_scrollx; + int32_t m_pf3_scrolly; + int32_t m_pf4_scrollx; + int32_t m_pf4_scrolly; #ifdef MAME_DEBUG int m_display_pf1; @@ -76,8 +76,8 @@ public: int m_displog; #endif - INT32 m_tiles_offsetx; - INT32 m_tiles_offsety; + int32_t m_tiles_offsetx; + int32_t m_tiles_offsety; tilemap_t *m_pf1_tilemap; tilemap_t *m_pf2_tilemap; @@ -133,7 +133,7 @@ public: DECLARE_MACHINE_RESET(zerowing); DECLARE_MACHINE_RESET(demonwld); DECLARE_MACHINE_RESET(vimana); - UINT32 screen_update_toaplan1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_toaplan1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_toaplan1(screen_device &screen, bool state); void screen_eof_samesame(screen_device &screen, bool state); @@ -173,7 +173,7 @@ public: DECLARE_WRITE8_MEMBER(rallybik_coin_w); DECLARE_READ16_MEMBER(rallybik_tileram16_r); DECLARE_VIDEO_START(rallybik); - UINT32 screen_update_rallybik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_rallybik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_rallybik(screen_device &screen, bool state); required_device<toaplan_scu_device> m_spritegen; |