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/thepit.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/includes/thepit.h')
-rw-r--r-- | src/mame/includes/thepit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index e0cf26f11ad..b3220c936c1 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -52,7 +52,7 @@ private: uint8_t m_flip_y; tilemap_t *m_solid_tilemap; tilemap_t *m_tilemap; - std::unique_ptr<uint16_t[]> m_dummy_tile; + std::unique_ptr<uint8_t[]> m_dummy_tile; uint8_t m_nmi_mask; int m_question_address; |