diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-24 00:57:13 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-02-24 01:15:39 (GMT) |
| commit | 3011367eb09249d94462c769da2e708e8a9aa930 (patch) | |
| tree | f9a7ea60d263ac6dc3441d051bd6876940478c23 /src | |
| parent | a64c202834e34760016932d401d0fb71b17ba56d (diff) | |
| download | powder-3011367eb09249d94462c769da2e708e8a9aa930.zip powder-3011367eb09249d94462c769da2e708e8a9aa930.tar.gz | |
Fix particles displaced by liquids moving to overlapping positions
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/powder.c b/src/powder.c index 11215d2..98fedb2 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1990,7 +1990,9 @@ killed: if (try_move(i, x, y, j, clear_y)) { parts[i].x = clear_xf+(j-clear_x); + parts[i].y = clear_yf; nx = j; + ny = clear_y; s = 1; break; } @@ -2002,11 +2004,11 @@ killed: else r = -1; if (s) - for (j=clear_y+r; j>=0 && j<YRES && j>=clear_y-rt && j<clear_y+rt; j+=r) + for (j=ny+r; j>=0 && j<YRES && j>=ny-rt && j<ny+rt; j+=r) { - if (try_move(i, x, y, nx, j)) + if (try_move(i, nx, ny, nx, j)) { - parts[i].y = clear_yf+(j-clear_y); + parts[i].y += j-ny; break; } if ((pmap[j][nx]&255)!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM)) |