diff options
author | 2019-07-20 12:31:21 +1000 | |
---|---|---|
committer | 2019-07-20 12:31:21 +1000 | |
commit | d2926fa02cef5bf728eac74c9e5586aced02a80b (patch) | |
tree | 820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/mame/video/bbusters.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/bbusters.cpp')
-rw-r--r-- | src/mame/video/bbusters.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/video/bbusters.cpp b/src/mame/video/bbusters.cpp index 866a2d56ddd..41ad5fd5337 100644 --- a/src/mame/video/bbusters.cpp +++ b/src/mame/video/bbusters.cpp @@ -94,7 +94,7 @@ void mechatt_state::video_start() else if (dy&0x40) code+=32; \ else if (dx&0x40) code+=16 -inline const uint16_t *bbusters_state_base::get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block) +inline const uint8_t *bbusters_state_base::get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block) { int code=0; @@ -147,7 +147,7 @@ void bbusters_state_base::draw_block(screen_device &screen, bitmap_ind16 &dest,i uint16_t *destline = &dest.pix16(dy); uint8_t *priorityline = &screen.priority().pix8(dy); uint8_t srcline=*m_scale_table_ptr; - const uint16_t *srcptr=nullptr; + const uint8_t *srcptr=nullptr; if (!flipy) srcline=size-srcline-1; |