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

Fix flood_parts crashes

Browse Source 
Crashes due to infinite recursion in flood_parts, which seemed to be caused by
the pmap being incorrect.
This commit is contained in:
jacksonmj 2011-02-06 17:16:49 +00:00
parent 21d0dd0ca2
commit b7e50f521c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/powder.c
View File

@ -253,11 +253,9 @@ int try_move(int i, int x, int y, int nx, int ny)
parts[e].x += x-nx; parts[e].x += x-nx;
parts[e].y += y-ny; parts[e].y += y-ny;
pmap[(int)(parts[e].y+0.5f)][(int)(parts[e].x+0.5f)] = (e<<8)|parts[e].type;
} }
pmap[ny][nx] = (i<<8)|parts[i].type;
pmap[y][x] = r;
return 1; return 1;
} }
@ -2030,10 +2028,18 @@ killed:
} }
nx = (int)(parts[i].x+0.5f); nx = (int)(parts[i].x+0.5f);
ny = (int)(parts[i].y+0.5f); ny = (int)(parts[i].y+0.5f);
if (nx<CELL || nx>=XRES-CELL || ny<CELL || ny>=YRES-CELL) if (ny!=y || nx!=x)
{ {
kill_part(i); if ((pmap[y][x]>>8)==i) pmap[y][x] = 0;
continue; if (nx<CELL || nx>=XRES-CELL || ny<CELL || ny>=YRES-CELL)
{
kill_part(i);
continue;
}
if (t==PT_PHOT)
photons[ny][nx] = t|(i<<8);
else
pmap[ny][nx] = t|(i<<8);
} }
} }
if (framerender) { if (framerender) {