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/atarigen.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/machine/atarigen.cpp')
-rw-r--r-- | src/mame/machine/atarigen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index bb01323951f..dd1f5329d87 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -683,14 +683,14 @@ void atarigen_state::blend_gfx(int gfx0, int gfx1, int mask0, int mask1) u8 *dest = srcdata; for (int c = 0; c < gx0->elements(); c++) { - const u16 *c0base = gx0->get_data(c); - const u16 *c1base = gx1->get_data(c); + const u8 *c0base = gx0->get_data(c); + const u8 *c1base = gx1->get_data(c); // loop over height for (int y = 0; y < gx0->height(); y++) { - const u16 *c0 = c0base; - const u16 *c1 = c1base; + const u8 *c0 = c0base; + const u8 *c1 = c1base; for (int x = 0; x < gx0->width(); x++) *dest++ = (*c0++ & mask0) | (*c1++ & mask1); |