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/cps1.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/includes/cps1.h')
-rw-r--r-- | src/mame/includes/cps1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 83073b7611b..21aa62441d0 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -376,12 +376,12 @@ protected: int m_palette_align; int m_palette_size; int m_stars_rom_size; - uint16_t m_empty_tile[32*32]; + uint8_t m_empty_tile[32*32]; int m_cps_version; /* fcrash video config */ - uint8_t m_layer_enable_reg; - uint8_t m_layer_mask_reg[4]; + uint8_t m_layer_enable_reg; + uint8_t m_layer_mask_reg[4]; int m_layer_scroll1x_offset; int m_layer_scroll2x_offset; int m_layer_scroll3x_offset; |