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/taito_f3.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/drivers/taito_f3.cpp')
-rw-r--r-- | src/mame/drivers/taito_f3.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 2615e49bdba..13db66e85d1 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -4217,14 +4217,14 @@ void taito_f3_state::tile_decode() dest = srcdata; for (int c = 0; c < spr_gfx->elements(); c++) { - const u16 *c1base = spr_gfx->get_data(c); - const u16 *c3base = spr_gfx_hi->get_data(c); + const u8 *c1base = spr_gfx->get_data(c); + const u8 *c3base = spr_gfx_hi->get_data(c); // loop over height for (int y = 0; y < spr_gfx->height(); y++) { - const u16 *c1 = c1base; - const u16 *c3 = c3base; + const u8 *c1 = c1base; + const u8 *c3 = c3base; /* Expand 2bits into 4bits format */ for (int x = 0; x < spr_gfx->width(); x++) @@ -4251,14 +4251,14 @@ void taito_f3_state::tile_decode() dest = srcdata; for (int c = 0; c < pf_gfx->elements(); c++) { - const u16 *c0base = pf_gfx->get_data(c); - const u16 *c2base = pf_gfx_hi->get_data(c); + const u8 *c0base = pf_gfx->get_data(c); + const u8 *c2base = pf_gfx_hi->get_data(c); // loop over height for (int y = 0; y < pf_gfx->height(); y++) { - const u16 *c0 = c0base; - const u16 *c2 = c2base; + const u8 *c0 = c0base; + const u8 *c2 = c2base; for (int x = 0; x < pf_gfx->width(); x++) *dest++ = (*c0++ & 0xf) | (*c2++ & 0x30); |