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/popeye.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/popeye.cpp')
-rw-r--r-- | src/mame/video/popeye.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/video/popeye.cpp b/src/mame/video/popeye.cpp index 4dc90efe7ea..b5052e8a1b6 100644 --- a/src/mame/video/popeye.cpp +++ b/src/mame/video/popeye.cpp @@ -318,8 +318,8 @@ void tnx1_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { gfx_element *gfx = m_gfxdecode->gfx(1); const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (a->color % gfx->colors())); - const uint16_t *source_base = gfx->get_data(a->code % gfx->elements()); - const uint16_t *source = source_base + (a->row ^ a->flipy) * gfx->rowbytes(); + const uint8_t *source_base = gfx->get_data(a->code % gfx->elements()); + const uint8_t *source = source_base + (a->row ^ a->flipy) * gfx->rowbytes(); if (bootleg_sprites() && flipx != a->flipx) { |