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/nemesis.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/includes/nemesis.h')
-rw-r--r-- | src/mame/includes/nemesis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index b0a5089d34a..c9a43a26617 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -85,7 +85,7 @@ private: int m_tilemap_flip; int m_flipscreen; uint8_t m_irq_port_last; - uint16_t m_blank_tile[8*8]; + uint8_t m_blank_tile[8*8]; uint8_t m_palette_lookup[32]; /* misc */ |