diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-14 12:09:46 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-14 12:09:46 (GMT) |
| commit | 33eb485c9f8240dc2bc488cac5dc1a8eb5bdcd36 (patch) | |
| tree | 61b58f2711f1d18a6a26fede66b11074db53634a /src | |
| parent | 550d270af28ba701931572182cc920d82de58999 (diff) | |
| download | powder-33eb485c9f8240dc2bc488cac5dc1a8eb5bdcd36.zip powder-33eb485c9f8240dc2bc488cac5dc1a8eb5bdcd36.tar.gz | |
Revert "-a"
This reverts commit 550d270af28ba701931572182cc920d82de58999.
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/powder.c b/src/powder.c index db9160d..f31e115 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1472,13 +1472,10 @@ void update_particles_i(pixel *vid, int start, int inc) if (nx||ny) { surround[j] = r = pmap[y+ny][x+nx]; j++; - if (!bmap[(y+ny)/CELL][(x+nx)/CELL] || bmap[(y+ny)/CELL][(x+nx)/CELL]==WL_STREAM) - { - if (!(r&0xFF)) - surround_space = 1;//there is empty space - if ((r&0xFF)!=t) - nt = 1;//there is nothing or a different particle - } + if (!(r&0xFF)) + surround_space = 1;//there is empty space + if ((r&0xFF)!=t) + nt = 1;//there is nothing or a different particle } } @@ -1983,9 +1980,7 @@ killed: goto movedone; } } - else s = 0; - // s==0 means particle has not yet moved, allow liquids code to run - if (s==0 && ptypes[t].falldown>1 && (parts[i].vy>fabs(parts[i].vx) || gravityMode==2)) + if (ptypes[t].falldown>1 && (parts[i].vy>fabsf(parts[i].vx) || gravityMode==2)) { // TODO: rewrite to operate better with radial gravity s = 0; |
