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/namcona1.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/namcona1.cpp')
-rw-r--r-- | src/mame/video/namcona1.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/video/namcona1.cpp b/src/mame/video/namcona1.cpp index ca000a7762c..228bf817fd9 100644 --- a/src/mame/video/namcona1.cpp +++ b/src/mame/video/namcona1.cpp @@ -233,8 +233,8 @@ void namcona1_state::pdraw_tile( gfx_element *mask = m_gfxdecode->gfx(2); const u16 pal_base = gfx->colorbase() + gfx->granularity() * (color % gfx->colors()); - const u16 *source_base = gfx->get_data((code % gfx->elements())); - const u16 *mask_base = mask->get_data((code % mask->elements())); + const u8 *source_base = gfx->get_data((code % gfx->elements())); + const u8 *mask_base = mask->get_data((code % mask->elements())); /* compute sprite increment per screen pixel */ int dx, dy; @@ -295,8 +295,8 @@ void namcona1_state::pdraw_tile( { /* skip if inner loop doesn't draw anything */ for (int y = sy; y < ey; y++) { - const u16 *source = source_base + y_index * gfx->rowbytes(); - const u16 *mask_addr = mask_base + y_index * mask->rowbytes(); + const u8 *source = source_base + y_index * gfx->rowbytes(); + const u8 *mask_addr = mask_base + y_index * mask->rowbytes(); u16 *dest = &dest_bmp.pix16(y); u8 *pri = &screen.priority().pix8(y); @@ -307,7 +307,7 @@ void namcona1_state::pdraw_tile( { if (pri[x] <= priority) { - const u16 c = source[x_index]; + const u8 c = source[x_index]; dest[x] = pal_base + c; } pri[x] = 0xff; @@ -319,7 +319,7 @@ void namcona1_state::pdraw_tile( { if (pri[x] <= priority) { - const u16 c = source[x_index]; + const u8 c = source[x_index]; /* render a shadow only if the sprites color is $F (8bpp) or $FF (4bpp) */ if (bShadow) |