From 3c14787064cba769be045a56de5406fa791ad541 Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Sun, 10 Jun 2012 22:31:01 +0100 Subject: [PATCH] Prevent THDR from counting towards stacked particle limit --- src/powder.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/powder.c b/src/powder.c index 2e55f49aa..de06b1678 100644 --- a/src/powder.c +++ b/src/powder.c @@ -2864,7 +2864,10 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but // To make particles collide correctly when inside these elements, these elements must not overwrite an existing pmap entry from particles inside them if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT)) pmap[y][x] = t|(i<<8); - pmap_count[y][x]++; + // Count number of particles at each location, for excess stacking check + // (does not include energy particles or THDR - currently no limit on stacking those) + if (t!=PT_THDR) + pmap_count[y][x]++; } } lastPartUsed = i;