diff options
| author | Jacob1 <jfu614@gmail.com> | 2012-06-21 22:01:32 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-22 23:10:39 (GMT) |
| commit | 287822229fec43c49f6952797ac249b4558fcb26 (patch) | |
| tree | ffe0efab7e09db3b062cbd4f9570a049656b1d55 /src/powder.c | |
| parent | 135e91b84dbc2c49319e73bce63aab2d7a22eb71 (diff) | |
| download | powder-287822229fec43c49f6952797ac249b4558fcb26.zip powder-287822229fec43c49f6952797ac249b4558fcb26.tar.gz | |
fix compression during fusion
Conflicts:
src/powder.c
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c index 6a7d68d..0e528fd 100644 --- a/src/powder.c +++ b/src/powder.c @@ -2918,7 +2918,7 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but pmap[y][x] = t|(i<<8); // Count number of particles at each location, for excess stacking check // (there are a few exceptions, including energy particles - currently no limit on stacking those) - if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH) + if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH && t!=PT_PLSM) pmap_count[y][x]++; } } |
