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

Attempt fix for liquids

Browse Source
This commit is contained in:
jacksonmj 2011-01-31 22:00:12 +00:00
parent 5bf8755655
commit d52fa30a45
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/powder.c
View File

@ -1963,15 +1963,15 @@ killed:
{ {
parts[i].x = clear_xf+(j-clear_x); parts[i].x = clear_xf+(j-clear_x);
parts[i].y = fin_yf; parts[i].y = fin_yf;
x = j; nx = j;
y = fin_y; ny = fin_y;
s = 1; s = 1;
break; break;
} }
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);
x = j; nx = j;
s = 1; s = 1;
break; break;
} }
@ -1985,12 +1985,12 @@ killed:
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=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); parts[i].y = clear_yf+(j-clear_y);
break; 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; s = 0;
break; break;