diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-12 16:08:12 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-12 16:08:12 (GMT) |
| commit | 345c183ee344c227c386221e49a094c62cf9799b (patch) | |
| tree | 0bf826e83ddec66c52c69a2f5a1ad159a726fec0 /src/powder.c | |
| parent | 8824bcc6095704a2295423775e5dd6213cd4284d (diff) | |
| parent | f1908bab0c5e63e051382a54a2868124d267721c (diff) | |
| download | powder-345c183ee344c227c386221e49a094c62cf9799b.zip powder-345c183ee344c227c386221e49a094c62cf9799b.tar.gz | |
Merge remote branch 'origin/master'
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 095a6ed..595132b 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1688,7 +1688,7 @@ void update_particles_i(pixel *vid, int start, int inc) pGravX -= gravx[y/CELL][x/CELL]; pGravY -= gravy[y/CELL][x/CELL]; } - else if(!(ptypes[t].properties & TYPE_SOLID)) + else if(t!=PT_STKM && t!=PT_STKM2 && !(ptypes[t].properties & TYPE_SOLID)) { pGravX += gravx[y/CELL][x/CELL]; pGravY += gravy[y/CELL][x/CELL]; |