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/drivers/cps3.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/drivers/cps3.cpp')
-rw-r--r-- | src/mame/drivers/cps3.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 508e079a174..5986ad19a8a 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -529,7 +529,7 @@ inline void cps3_state::cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle // const pen_t *pal = &gfx->colortable[gfx->granularity() * (color % gfx->colors())]; u32 palbase = (gfx->granularity() * color) & 0x1ffff; const pen_t *pal = &m_mame_colours[palbase]; - const u16 *source_base = gfx->get_data(code % gfx->elements()); + const u8 *source_base = gfx->get_data(code % gfx->elements()); int sprite_screen_height = (scaley*gfx->height()+0x8000)>>16; int sprite_screen_width = (scalex*gfx->width()+0x8000)>>16; @@ -595,7 +595,7 @@ inline void cps3_state::cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle { 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(); u32 *dest = &dest_bmp.pix32(y); int x_index = x_index_base; @@ -611,7 +611,7 @@ inline void cps3_state::cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle { 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(); u32 *dest = &dest_bmp.pix32(y); int x_index = x_index_base; @@ -628,7 +628,7 @@ inline void cps3_state::cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle { 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(); u32 *dest = &dest_bmp.pix32(y); int x_index = x_index_base; @@ -645,7 +645,7 @@ inline void cps3_state::cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle { 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(); u32 *dest = &dest_bmp.pix32(y); int x_index = x_index_base; |