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/includes/bbusters.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/includes/bbusters.h')
-rw-r--r-- | src/mame/includes/bbusters.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index bfd451853c9..d078fe982d0 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -58,7 +58,7 @@ protected: template<int Layer> DECLARE_WRITE16_MEMBER(pf_w); DECLARE_WRITE8_MEMBER(coin_counter_w); - const uint16_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block); + const uint8_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block); void draw_block(screen_device &screen, bitmap_ind16 &dest,int x,int y,int size,int flipx,int flipy,uint32_t sprite,int color,int bank,int block,int priority); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const uint16_t *source, int bank); |