diff options
Diffstat (limited to 'src/mame/drivers/joystand.cpp')
-rw-r--r-- | src/mame/drivers/joystand.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 88cd4581426..12a84006bed 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -153,13 +153,13 @@ public: required_device<okim6295_device> m_oki; // memory pointers - required_shared_ptr<UINT16> m_bg1_ram; - required_shared_ptr<UINT16> m_bg2_ram; - required_shared_ptr<UINT16> m_bg15_0_ram; - required_shared_ptr<UINT16> m_bg15_1_ram; - required_shared_ptr<UINT16> m_scroll; - required_shared_ptr<UINT16> m_enable; - required_shared_ptr<UINT16> m_outputs; + required_shared_ptr<uint16_t> m_bg1_ram; + required_shared_ptr<uint16_t> m_bg2_ram; + required_shared_ptr<uint16_t> m_bg15_0_ram; + required_shared_ptr<uint16_t> m_bg15_1_ram; + required_shared_ptr<uint16_t> m_scroll; + required_shared_ptr<uint16_t> m_enable; + required_shared_ptr<uint16_t> m_outputs; // tilemaps tilemap_t *m_bg1_tmap; @@ -174,7 +174,7 @@ public: DECLARE_WRITE16_MEMBER(bg15_0_w); DECLARE_WRITE16_MEMBER(bg15_1_w); static const rgb_t BG15_TRANSPARENT; - void draw_bg15_tile(address_space &space, int x, int y, UINT16 code); + void draw_bg15_tile(address_space &space, int x, int y, uint16_t code); void draw_bg15_tilemap(); bool bg15_tiles_dirty; @@ -194,7 +194,7 @@ public: DECLARE_WRITE16_MEMBER(outputs_w); // screen updates - UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void video_start() override; // machine @@ -213,13 +213,13 @@ const rgb_t joystand_state::BG15_TRANSPARENT = 0x99999999; TILE_GET_INFO_MEMBER(joystand_state::get_bg1_tile_info) { - UINT32 code = (m_bg1_ram[tile_index * 2 + 0] << 16) | m_bg1_ram[tile_index * 2 + 1]; + uint32_t code = (m_bg1_ram[tile_index * 2 + 0] << 16) | m_bg1_ram[tile_index * 2 + 1]; SET_TILE_INFO_MEMBER(0, code & 0x00ffffff, code >> 24, 0); } TILE_GET_INFO_MEMBER(joystand_state::get_bg2_tile_info) { - UINT32 code = (m_bg2_ram[tile_index * 2 + 0] << 16) | m_bg2_ram[tile_index * 2 + 1]; + uint32_t code = (m_bg2_ram[tile_index * 2 + 0] << 16) | m_bg2_ram[tile_index * 2 + 1]; SET_TILE_INFO_MEMBER(0, code & 0x00ffffff, code >> 24, 0); } @@ -244,12 +244,12 @@ WRITE16_MEMBER(joystand_state::bg2_w) // pixel-based WRITE16_MEMBER(joystand_state::bg15_0_w) { - UINT16 val = COMBINE_DATA(&m_bg15_0_ram[offset]); + uint16_t val = COMBINE_DATA(&m_bg15_0_ram[offset]); m_bg15_bitmap[0].pix32(offset >> 9, offset & 0x1ff) = (val & 0x8000) ? BG15_TRANSPARENT : m_bg15_palette->pen_color(val & 0x7fff); } // tile-based -void joystand_state::draw_bg15_tile(address_space &space, int x, int y, UINT16 code) +void joystand_state::draw_bg15_tile(address_space &space, int x, int y, uint16_t code) { x *= 16; y *= 16; @@ -259,7 +259,7 @@ void joystand_state::draw_bg15_tile(address_space &space, int x, int y, UINT16 c { for (int tx = 0; tx < 16; ++tx) { - UINT16 val = space.read_word(srcaddr + ty * 16 * 2 + tx * 2); + uint16_t val = space.read_word(srcaddr + ty * 16 * 2 + tx * 2); m_bg15_bitmap[1].pix32(y + ty , x + tx) = (val & 0x8000) ? BG15_TRANSPARENT : m_bg15_palette->pen_color(val & 0x7fff); } } @@ -273,7 +273,7 @@ void joystand_state::draw_bg15_tilemap() bg15_tiles_dirty = false; address_space &space = m_maincpu->space(AS_PROGRAM); - UINT16 *src = m_bg15_1_ram + 2/2; + uint16_t *src = m_bg15_1_ram + 2/2; for (int y = 0; y < 0x10; ++y) { for (int x = 0; x < 0x20; ++x) @@ -287,7 +287,7 @@ void joystand_state::draw_bg15_tilemap() WRITE16_MEMBER(joystand_state::bg15_1_w) { - UINT16 code = COMBINE_DATA(&m_bg15_1_ram[offset]); + uint16_t code = COMBINE_DATA(&m_bg15_1_ram[offset]); if ((offset & 0x83) == 0x01) draw_bg15_tile(space, (offset/4) & 0x1f, offset/0x100, code); } @@ -315,7 +315,7 @@ void joystand_state::video_start() bg15_tiles_dirty = true; } -UINT32 joystand_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) +uint32_t joystand_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) { int layers_ctrl = -1; |