summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-10 21:31:01 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-10 21:31:01 (GMT)
commit3c14787064cba769be045a56de5406fa791ad541 (patch)
tree24405cb584752ebedb0e1d68b9711034546a44a8 /src
parent6d307b47b5e91202f9cc1a4cc299475ff0d68493 (diff)
downloadpowder-3c14787064cba769be045a56de5406fa791ad541.zip
powder-3c14787064cba769be045a56de5406fa791ad541.tar.gz
Prevent THDR from counting towards stacked particle limit
Diffstat (limited to 'src')
-rw-r--r--src/powder.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index 2e55f49..de06b16 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;