From b4472f60d1d263d7b2eb033da431fd7d8947b748 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 20 Dec 2014 13:36:40 +0000 Subject: [PATCH] Polymer: don't draw masked walls with void tile. DONT_BUILD. This prevents displaying W_FORCEFIELD+1 masks (as e.g. in front of viewscreens) completely black with ART mapping. The old behavior, which is inconsistent with classic, is kept for one-sided masked walls, though. git-svn-id: https://svn.eduke32.com/eduke32@4830 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/polymer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index fede36f47..0f65e14b2 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -1794,7 +1794,12 @@ static void polymer_displayrooms(const int16_t dacursectnum) } if ((wall[sec->wallptr + i].cstat & 48) == 16) - localmaskwall[localmaskwallcnt++] = sec->wallptr + i; + { + int pic = wall[sec->wallptr + i].overpicnum; + + if (tilesiz[pic].x > 0 && tilesiz[pic].y > 0) + localmaskwall[localmaskwallcnt++] = sec->wallptr + i; + } if (!depth && (overridematerial & prprogrambits[PR_BIT_MIRROR_MAP].bit) && wall[sec->wallptr + i].overpicnum == 560 &&