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/includes/namcos22.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/includes/namcos22.h')
-rw-r--r-- | src/mame/includes/namcos22.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index c5f79889b25..f61174d4457 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -126,7 +126,7 @@ struct namcos22_object_data const u8 *czram; /* sprites */ - const u16 *source; + const u8 *source; int alpha; int line_modulo; int flipx; @@ -234,7 +234,7 @@ public: int m_poly_translucency; u16 *m_texture_tilemap; std::unique_ptr<u8[]> m_texture_tileattr; - u16 *m_texture_tiledata; + u8 *m_texture_tiledata; std::unique_ptr<u8[]> m_texture_ayx_to_pixel; int m_is_ss22; int m_mixer_flags; |