matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix particles displaced by liquids moving to overlapping positions

Browse Source
This commit is contained in:
jacksonmj 2011-02-24 00:57:13 +00:00
parent 7ecaa16362
commit 71a6654c03
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/powder.c
View File

@ -1988,7 +1988,9 @@ killed:
if (try_move(i, x, y, j, clear_y)) if (try_move(i, x, y, j, clear_y))
{ {
parts[i].x = clear_xf+(j-clear_x); parts[i].x = clear_xf+(j-clear_x);
parts[i].y = clear_yf;
nx = j; nx = j;
ny = clear_y;
s = 1; s = 1;
break; break;
} }
@ -2000,11 +2002,11 @@ killed:
else else
r = -1; r = -1;
if (s) 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; break;
} }
if ((pmap[j][nx]&255)!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM)) if ((pmap[j][nx]&255)!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM))