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/namcos2_sprite.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/namcos2_sprite.cpp')
-rw-r--r-- | src/mame/video/namcos2_sprite.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/video/namcos2_sprite.cpp b/src/mame/video/namcos2_sprite.cpp index 28877eed118..7d2f2f434b7 100644 --- a/src/mame/video/namcos2_sprite.cpp +++ b/src/mame/video/namcos2_sprite.cpp @@ -52,7 +52,7 @@ void namcos2_sprite_device::zdrawgfxzoom( device_palette_interface &palette = gfx->palette(); const int shadow_offset = (palette.shadows_enabled()) ? palette.entries() : 0; const pen_t *pal = &palette.pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors())); - const u16 *source_base = gfx->get_data(code % gfx->elements()); + const u8 *source_base = gfx->get_data(code % gfx->elements()); const int sprite_screen_height = (scaley * gfx->height() + 0x8000) >> 16; const int sprite_screen_width = (scalex * gfx->width() + 0x8000) >> 16; if (sprite_screen_width && sprite_screen_height) @@ -117,7 +117,7 @@ void namcos2_sprite_device::zdrawgfxzoom( { for (int y = sy; y < ey; y++) { - const u16 *source = source_base + (y_index>>16) * gfx->rowbytes(); + const u8 *source = source_base + (y_index>>16) * gfx->rowbytes(); u16 *dest = &dest_bmp.pix16(y); u8 *pri = &priority_bitmap.pix8(y); int x_index = x_index_base; @@ -126,7 +126,7 @@ void namcos2_sprite_device::zdrawgfxzoom( { for (int x = sx; x < ex; x++) { - const u16 c = source[x_index >> 16]; + const u8 c = source[x_index >> 16]; if (c != 0xff) { if (pri[x] <= zpos) @@ -155,7 +155,7 @@ void namcos2_sprite_device::zdrawgfxzoom( { for (int x = sx; x < ex; x++) { - const u16 c = source[x_index >> 16]; + const u8 c = source[x_index >> 16]; if (c != 0xff) { if (pri[x] <= zpos) |