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

Fix segfault when there are no unused particles before parts_lastActiveIndex

Browse Source
This commit is contained in:
jacksonmj 2011-08-11 16:41:10 +08:00 committed by Simon Robertshaw
parent 3ed6a44a24
commit 806e1933a2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/powder.c
View File

@ -2447,8 +2447,16 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but
lastPartUnused = i; lastPartUnused = i;
} }
} }
if (lastPartUnused==-1)
{
if (parts_lastActiveIndex>=NPART-1) pfree = -1;
else pfree = parts_lastActiveIndex+1;
}
else
{
if (parts_lastActiveIndex>=NPART-1) parts[lastPartUnused].life = -1; if (parts_lastActiveIndex>=NPART-1) parts[lastPartUnused].life = -1;
else parts[lastPartUnused].life = parts_lastActiveIndex+1; else parts[lastPartUnused].life = parts_lastActiveIndex+1;
}
parts_lastActiveIndex = lastPartUsed; parts_lastActiveIndex = lastPartUsed;
for (y=0; y<YRES/CELL; y++) for (y=0; y<YRES/CELL; y++)
{ {