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

Revert "-a"

Browse Source 
This reverts commit 550d270af2.
This commit is contained in:
Simon Robertshaw 2011-05-14 13:09:46 +01:00
parent 550d270af2
commit 33eb485c9f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/powder.c
View File

@ -1472,15 +1472,12 @@ void update_particles_i(pixel *vid, int start, int inc)
if (nx||ny) { if (nx||ny) {
surround[j] = r = pmap[y+ny][x+nx]; surround[j] = r = pmap[y+ny][x+nx];
j++; j++;
if (!bmap[(y+ny)/CELL][(x+nx)/CELL] || bmap[(y+ny)/CELL][(x+nx)/CELL]==WL_STREAM)
{
if (!(r&0xFF)) if (!(r&0xFF))
surround_space = 1;//there is empty space surround_space = 1;//there is empty space
if ((r&0xFF)!=t) if ((r&0xFF)!=t)
nt = 1;//there is nothing or a different particle nt = 1;//there is nothing or a different particle
} }
} }
}
if (!legacy_enable) if (!legacy_enable)
{ {
@ -1983,9 +1980,7 @@ killed:
goto movedone; goto movedone;
} }
} }
else s = 0; if (ptypes[t].falldown>1 && (parts[i].vy>fabsf(parts[i].vx) || gravityMode==2))
// 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))
{ {
// TODO: rewrite to operate better with radial gravity // TODO: rewrite to operate better with radial gravity
s = 0; s = 0;