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

Fix crash when flood fill deleting life

Browse Source
This commit is contained in:
jacksonmj 2012-04-14 19:12:08 +01:00
parent db9e38d1e3
commit 7a844f51ff
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/powder.c
View File

@ -592,11 +592,20 @@ void kill_part(int i)//kills particle number i
{ {
int x, y; int x, y;
// Remove from pmap even if type==0, otherwise infinite recursion occurs when flood fill deleting
// a particle which sets type to 0 without calling kill_part (such as LIFE)
x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f);
if (x>=0 && y>=0 && x<XRES && y<YRES) {
if ((pmap[y][x]>>8)==i)
pmap[y][x] = 0;
else if ((photons[y][x]>>8)==i)
photons[y][x] = 0;
}
if (parts[i].type == PT_NONE) //This shouldn't happen anymore, but it's here just in case if (parts[i].type == PT_NONE) //This shouldn't happen anymore, but it's here just in case
return; return;
x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f);
if (parts[i].type == PT_STKM) if (parts[i].type == PT_STKM)
{ {
player.spwn = 0; player.spwn = 0;
@ -622,12 +631,6 @@ void kill_part(int i)//kills particle number i
{ {
detach(i); detach(i);
} }
if (x>=0 && y>=0 && x<XRES && y<YRES) {
if ((pmap[y][x]>>8)==i)
pmap[y][x] = 0;
else if ((photons[y][x]>>8)==i)
photons[y][x] = 0;
}
parts[i].type = PT_NONE; parts[i].type = PT_NONE;
parts[i].life = pfree; parts[i].life = pfree;