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/machine/st0016.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/machine/st0016.cpp')
-rw-r--r-- | src/mame/machine/st0016.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index 9431191ff22..17cf6e660be 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -496,7 +496,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip int yloop, xloop; int ypos, xpos; int tileno; - const uint16_t *srcgfx; + const uint8_t *srcgfx; int gfxoffs; ypos = sy + y0 * 8 + spr_dy; xpos = sx + x0 * 8 + spr_dx; @@ -641,7 +641,7 @@ void st0016_cpu_device::draw_bgmap(bitmap_ind16 &bitmap, const rectangle &clipre uint16_t *destline; int yloop, xloop; int ypos, xpos; - const uint16_t *srcgfx; + const uint8_t *srcgfx; int gfxoffs; ypos = y * 8 + spr_dy;//+((st0016_vregs[j+2]==0xaf)?0x50:0);//hack for mayjinsen title screen xpos = x * 8 + spr_dx; |