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

Fixes for previous commit

Browse Source 
Previous commit caused buggy movement in walls
This commit is contained in:
jacksonmj 2011-04-27 19:54:26 +01:00 committed by Simon Robertshaw
parent ddaed2ad69
commit a7b5718c6a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/powder.c
View File

@ -1459,13 +1459,10 @@ void update_particles_i(pixel *vid, int start, int inc)
if (nx||ny) {
surround[j] = r = pmap[y+ny][x+nx];
j++;
if (!bmap[(y+ny)/CELL][(x+nx)/CELL] || bmap[(y+ny)/CELL][(x+nx)/CELL]==WL_STREAM)
{
if (!(r&0xFF))
surround_space = 1;//there is empty space
if ((r&0xFF)!=t)
nt = 1;//there is nothing or a different particle
}
if (!(r&0xFF))
surround_space = 1;//there is empty space
if ((r&0xFF)!=t)
nt = 1;//there is nothing or a different particle
}
}
@ -1972,7 +1969,7 @@ killed:
else s = 0;
}
else s = 0;
// s==0 means particle has not yet moved, allow liquids code to run
// s==0 means particle has not yet moved, allow rest of movement code to run
if (s==0 && ptypes[t].falldown>1 && (parts[i].vy>fabs(parts[i].vx) || gravityMode==2))
{
s = 0;
@ -2032,7 +2029,7 @@ killed:
parts[i].vx *= ptypes[t].collision;
parts[i].vy *= ptypes[t].collision;
}
else
else if (s==0)
{
if ((clear_x!=x||clear_y!=y) && try_move(i, x, y, clear_x, clear_y)) {
// if interpolation was done, try moving to last clear position