diff options
author | 2019-07-19 02:46:30 +1000 | |
---|---|---|
committer | 2019-07-19 02:46:30 +1000 | |
commit | 7978022a9712629f0a96a301092967a0730f9a4f (patch) | |
tree | ab3b791db330150b82d054771df6bc7c71f68356 /src/emu/tilemap.cpp | |
parent | 8093eb3a543e346dadf0a389c70807c1b2046c34 (diff) | |
parent | c182039d8e96f046eaf8d8f6d071f61d46bf87f4 (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
# src/frontend/mame/ui/ui.cpp
Diffstat (limited to 'src/emu/tilemap.cpp')
-rw-r--r-- | src/emu/tilemap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index c5c0ff16ad3..460e511336e 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -401,7 +401,7 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, device_gfx_interface &decod // set up the default tile data memset(&m_tileinfo, 0, sizeof(m_tileinfo)); m_tileinfo.decoder = &decoder; - m_tileinfo.pen_mask = 0xff; + m_tileinfo.pen_mask = 0xffff; m_tileinfo.gfxnum = 0xff; // allocate transparency mapping data @@ -780,7 +780,7 @@ g_profiler.stop(); // the palette_base //------------------------------------------------- -u8 tilemap_t::tile_draw(const u8 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u8 pen_mask) +u8 tilemap_t::tile_draw(const u16 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u16 pen_mask) { // OR in the force layer flags category |= flags & (TILE_FORCE_LAYER0 | TILE_FORCE_LAYER1 | TILE_FORCE_LAYER2); @@ -816,7 +816,7 @@ u8 tilemap_t::tile_draw(const u8 *pendata, u32 x0, u32 y0, u32 palette_base, u8 int xoffs = 0; for (u16 tx = 0; tx < m_tilewidth; tx++) { - u8 pen = (*pendata++) & pen_mask; + u16 pen = (*pendata++) & pen_mask; u8 map = penmap[pen]; pixptr[xoffs] = palette_base + pen; flagsptr[xoffs] = map | category; |