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

Fix crash with negative lava ctype

Browse Source 
E.g. "set type prti lava"
This commit is contained in:
jacksonmj 2011-05-12 18:33:29 +01:00 committed by Simon Robertshaw
parent c4140955de
commit e675fb3cc1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/powder.c
View File

@ -1396,8 +1396,11 @@ void update_particles_i(pixel *vid, int start, int inc)
lx = parts[i].x; lx = parts[i].x;
ly = parts[i].y; ly = parts[i].y;
t = parts[i].type; t = parts[i].type;
if (t>=PT_NUM) if (t<0 || t>=PT_NUM)
{
kill_part(i);
continue; continue;
}
//printf("parts[%d].type: %d\n", i, parts[i].type); //printf("parts[%d].type: %d\n", i, parts[i].type);
if (parts[i].life>0 && (ptypes[t].properties&PROP_LIFE_DEC)) if (parts[i].life>0 && (ptypes[t].properties&PROP_LIFE_DEC))
@ -1599,7 +1602,7 @@ void update_particles_i(pixel *vid, int start, int inc)
else t = PT_DSTW; else t = PT_DSTW;
} }
else if (t==PT_LAVA) { else if (t==PT_LAVA) {
if (parts[i].ctype && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) { if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) {
if (parts[i].ctype==PT_THRM&&pt>=ptransitions[PT_BMTL].thv) s = 0; if (parts[i].ctype==PT_THRM&&pt>=ptransitions[PT_BMTL].thv) s = 0;
else if (ptransitions[parts[i].ctype].tht==PT_LAVA) { else if (ptransitions[parts[i].ctype].tht==PT_LAVA) {
if (pt>=ptransitions[parts[i].ctype].thv) s = 0; if (pt>=ptransitions[parts[i].ctype].thv) s = 0;