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/tatsumi.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/tatsumi.cpp')
-rw-r--r-- | src/mame/video/tatsumi.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index 8f1c6388d82..2472576049c 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -117,7 +117,7 @@ inline void tatsumi_state::roundupt_drawgfxzoomrotate( _BitmapClass &dest_bmp, c { const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors())); const uint8_t *shadow_pens = m_shadow_pen_array.get() + (gfx->granularity() * (color % gfx->colors())); - const uint16_t *code_base = gfx->get_data(code % gfx->elements()); + const uint8_t *code_base = gfx->get_data(code % gfx->elements()); int block_size = 8 * scalex; int sprite_screen_height = ((ssy&0xffff)+block_size)>>16; @@ -237,7 +237,7 @@ inline void tatsumi_state::roundupt_drawgfxzoomrotate( _BitmapClass &dest_bmp, c int x, x_index = x_index_base; for( x=sx; x<ex; x++ ) { - const uint16_t *source = code_base + (cy>>16) * gfx->rowbytes(); + const uint8_t *source = code_base + (cy>>16) * gfx->rowbytes(); int c = source[(cx >> 16)]; if( c != transparent_color ) { @@ -260,7 +260,7 @@ inline void tatsumi_state::roundupt_drawgfxzoomrotate( _BitmapClass &dest_bmp, c { for( y=sy; y<ey; y++ ) { - const uint16_t *source = code_base + (y_index>>16) * gfx->rowbytes(); + const uint8_t *source = code_base + (y_index>>16) * gfx->rowbytes(); typename _BitmapClass::pixel_t *dest = &dest_bmp.pix(y); int x, x_index = x_index_base; @@ -1158,12 +1158,12 @@ void cyclwarr_state::tile_expand() dest = srcdata; for (int c = 0; c < gx0->elements(); c++) { - const uint16_t *c0base = gx0->get_data(c); + const uint8_t *c0base = gx0->get_data(c); // loop over height for (int y = 0; y < gx0->height(); y++) { - const uint16_t *c0 = c0base; + const uint8_t *c0 = c0base; for (int x = 0; x < gx0->width(); x++) { |