summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Alex W. Jackson <alex.w.jackson@gmail.com>2014-11-07 04:14:12 -0500
committer Alex W. Jackson <alex.w.jackson@gmail.com>2014-11-07 04:14:12 -0500
commit4fe7a561923379c47fe127cc85066357c32c7f2e (patch)
tree5335d18bfcae38bdf10ac7d59a436e016c56f402
parentf4b87dcd558db8ba314921883014e80eba5660a9 (diff)
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)
-rw-r--r--src/emu/tilemap.h3
1 files changed, 2 insertions, 1 deletions
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;
}