diff options
author | 2019-07-18 23:17:11 +0900 | |
---|---|---|
committer | 2019-07-18 10:17:11 -0400 | |
commit | a5e00faf88ec05d1705b9bc4796cc6f21f2cc7a9 (patch) | |
tree | ce9426cca7d5a2393a93a6438ffeec2f784f1533 /src/emu/tilemap.cpp | |
parent | 1c91003578a8b73e1d3039ada7b3a278d8c607ad (diff) |
Allow 16bpp gfxdecode (#5167)
* digfx.cpp : Add 16bpp case of RAW gfx layout
drawgfx.cpp, tilemap.cpp : Make changeable total elements of gfx_elements constructor at RAW case, Allow 16bpp gfxdecode, Fix spacing
tilemap.cpp : Allow 16bpp tilemap pen data
gstream.cpp : Use gfxdecode for 16bpp gfx of X2222, Fix spacing
igs017_igs031.cpp : Cleanup single sprite drawing routine
jedi.cpp : Improve debug gfxdecode viewer(text gfx)
* cps1.cpp : Minor fixes
* gstream.cpp : Fix regression in x2222
drawgfx.cpp : Fix 16bpp transparent pen
* gstream.cpp : Fix regression, Reduce unnecessary lines
* Sync to master
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; |