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/grchamp.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/grchamp.cpp')
-rw-r--r-- | src/mame/video/grchamp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/video/grchamp.cpp b/src/mame/video/grchamp.cpp index fc39267e95a..03eb3b23b6f 100644 --- a/src/mame/video/grchamp.cpp +++ b/src/mame/video/grchamp.cpp @@ -271,7 +271,7 @@ void grchamp_state::draw_objects(int y, uint8_t *objdata) int code = (codeflip & 0x3f) + (change >> 2); int yflip = (codeflip & 0x80) ? 0x0f : 0x00; int xflip = (codeflip & 0x40) ? 0x0f : 0x00; - const uint16_t *src = gfx->get_data(code) + ((dy ^ yflip) & 15) * gfx->rowbytes(); + const uint8_t *src = gfx->get_data(code) + ((dy ^ yflip) & 15) * gfx->rowbytes(); /* the third byte is: color in bits 0-2 */ int color = (m_spriteram[0x42 + (dataoffs & ~0x20)] & 0x07) << 2; @@ -315,7 +315,7 @@ void grchamp_state::draw_objects(int y, uint8_t *objdata) int dy = sy + ~y; int color = (m_spriteram[0x01 + dataoffs] & 0x07) << 2; int code = m_videoram[hprime | ((dy & 0xf8) << 2)] + change; - const uint16_t *src = gfx->get_data(code) + (dy & 7) * gfx->rowbytes(); + const uint8_t *src = gfx->get_data(code) + (dy & 7) * gfx->rowbytes(); int x; /* draw 8 pixels */ |