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/armedf.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/armedf.cpp')
-rw-r--r-- | src/mame/video/armedf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/video/armedf.cpp b/src/mame/video/armedf.cpp index b6e5681e119..5e15e0ff151 100644 --- a/src/mame/video/armedf.cpp +++ b/src/mame/video/armedf.cpp @@ -263,7 +263,7 @@ void armedf_state::armedf_drawgfx(bitmap_ind16 &dest_bmp,const rectangle &clip,g int transparent_color) { const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors())); - const uint16_t *source_base = gfx->get_data(code % gfx->elements()); + const uint8_t *source_base = gfx->get_data(code % gfx->elements()); int x_index_base, y_index, sx, sy, ex, ey; int xinc, yinc; @@ -310,7 +310,7 @@ void armedf_state::armedf_drawgfx(bitmap_ind16 &dest_bmp,const rectangle &clip,g { for (y = sy; y < ey; y++) { - const uint16_t *source = source_base + y_index*gfx->rowbytes(); + const uint8_t *source = source_base + y_index*gfx->rowbytes(); uint16_t *dest = &dest_bmp.pix16(y); int x_index = x_index_base; for (x = sx; x < ex; x++) |