summaryrefslogtreecommitdiffstats
path: root/src/emu/tilemap.cpp
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-07-19 16:35:20 -0400
committer GitHub <noreply@github.com>2019-07-19 16:35:20 -0400
commit9b55ced1d29bfeb7b6fe401feab44a8286fda8c6 (patch)
treec44fa92b54dbb723d0f3489004e88ef5c6db0ab8 /src/emu/tilemap.cpp
parent802262d37c03b8531f340dc898bebe9ab394c4e4 (diff)
Revert "Allow 16bpp gfxdecode (#5167)"
This reverts commit a5e00faf88ec05d1705b9bc4796cc6f21f2cc7a9.
Diffstat (limited to 'src/emu/tilemap.cpp')
-rw-r--r--src/emu/tilemap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp
index 460e511336e..c5c0ff16ad3 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 = 0xffff;
+ m_tileinfo.pen_mask = 0xff;
m_tileinfo.gfxnum = 0xff;
// allocate transparency mapping data
@@ -780,7 +780,7 @@ g_profiler.stop();
// the palette_base
//-------------------------------------------------
-u8 tilemap_t::tile_draw(const u16 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u16 pen_mask)
+u8 tilemap_t::tile_draw(const u8 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u8 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 u16 *pendata, u32 x0, u32 y0, u32 palette_base, u8
int xoffs = 0;
for (u16 tx = 0; tx < m_tilewidth; tx++)
{
- u16 pen = (*pendata++) & pen_mask;
+ u8 pen = (*pendata++) & pen_mask;
u8 map = penmap[pen];
pixptr[xoffs] = palette_base + pen;
flagsptr[xoffs] = map | category;