diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-31 22:00:12 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-31 22:00:12 (GMT) |
| commit | d52fa30a45f24ad8cb5e8669c7128b193b517590 (patch) | |
| tree | cc35f98f4c5a018d7cc32f56a2210ff4fcdbbe5f /src | |
| parent | 5bf8755655c081610db47288c15e65f8e7b748ba (diff) | |
| download | powder-d52fa30a45f24ad8cb5e8669c7128b193b517590.zip powder-d52fa30a45f24ad8cb5e8669c7128b193b517590.tar.gz | |
Attempt fix for liquids
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/powder.c b/src/powder.c index a378da4..493dec7 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1963,15 +1963,15 @@ killed: { parts[i].x = clear_xf+(j-clear_x); parts[i].y = fin_yf; - x = j; - y = fin_y; + nx = j; + ny = fin_y; s = 1; break; } if (try_move(i, x, y, j, clear_y)) { parts[i].x = clear_xf+(j-clear_x); - x = j; + nx = j; s = 1; break; } @@ -1985,12 +1985,12 @@ killed: if (s) for (j=clear_y+r; j>=0 && j<YRES && j>=clear_y-rt && j<clear_y+rt; j+=r) { - if (try_move(i, x, y, clear_x, j)) + if (try_move(i, x, y, nx, j)) { parts[i].y = clear_yf+(j-clear_y); break; } - if ((pmap[j][x]&255)!=t || (bmap[j/CELL][x/CELL] && bmap[j/CELL][x/CELL]!=WL_STREAM)) + if ((pmap[j][nx]&255)!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM)) { s = 0; break; |