diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-14 17:32:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-14 17:32:10 (GMT) |
| commit | dcd3af94404b1d1bb296566a84177cc37e0b83d5 (patch) | |
| tree | 77385a265e760cd8bd86ac9077e2c0f58c6204e8 /src/powder.c | |
| parent | d3153aae85f2e3cd1ba8ff0520e5ebe51e08d7d5 (diff) | |
| parent | ca66525bea67de164603163752aee0212d59df34 (diff) | |
| download | powder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.zip powder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
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]; |