From 4fe7a561923379c47fe127cc85066357c32c7f2e Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Fri, 7 Nov 2014 04:14:12 -0500 Subject: tilemap.c: Respect gfx_element::colors() just like drawgfx.c does. Add temporary assert to catch regressions (i.e. drivers that didn't define their gfx elements correctly) (nw) --- src/emu/tilemap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index 7804d71f68b..9f23838ca19 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -443,8 +443,9 @@ struct tile_data { gfx_element *gfx = decoder->gfx(_gfxnum); int code = rawcode % gfx->elements(); + assert(rawcolor < gfx->colors()); // TEMPORARY ASSERT pen_data = gfx->get_data(code); - palette_base = gfx->colorbase() + gfx->granularity() * rawcolor; + palette_base = gfx->colorbase() + gfx->granularity() * (rawcolor % gfx->colors()); flags = _flags; gfxnum = _gfxnum; } -- cgit v1.2.3