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

Remove some unnecessary checks

Browse Source
This commit is contained in:
jacksonmj 2011-04-28 14:35:00 +01:00 committed by Simon Robertshaw
parent 892a2b11c7
commit 0aa4970b33
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/elements/pyro.c
View File

@ -32,11 +32,11 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
if (bmap[(y+ry)/CELL][(x+rx)/CELL] && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_STREAM) if (bmap[(y+ry)/CELL][(x+rx)/CELL] && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_STREAM)
continue; continue;
rt = parts[r>>8].type; rt = parts[r>>8].type;
if ((surround_space || ptypes[rt].explosive) && (t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL && rt!=PT_SWCH)) && if ((surround_space || ptypes[rt].explosive) &&
!(t==PT_PHOT && rt==PT_INSL) && (t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) &&
(t!=PT_LAVA || parts[i].life>0 || (rt!=PT_STNE && rt!=PT_PSCN && rt!=PT_NSCN && rt!=PT_NTCT && rt!=PT_PTCT && rt!=PT_METL && rt!=PT_IRON && rt!=PT_ETRD && rt!=PT_BMTL && rt!=PT_BRMT && rt!=PT_SWCH && rt!=PT_INWR && rt!=PT_QRTZ)) (t!=PT_PHOT || rt!=PT_INSL) &&
&& !(rt==PT_SPNG && parts[r>>8].life>0) && (rt!=PT_SPNG || parts[r>>8].life==0) &&
ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000)) ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
{ {
part_change_type(r>>8,x+rx,y+ry,PT_FIRE); part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
parts[r>>8].temp = restrict_flt(ptypes[PT_FIRE].heat + (ptypes[rt].flammable/2), MIN_TEMP, MAX_TEMP); parts[r>>8].temp = restrict_flt(ptypes[PT_FIRE].heat + (ptypes[rt].flammable/2), MIN_TEMP, MAX_TEMP);
@ -44,7 +44,6 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
parts[r>>8].tmp = parts[r>>8].ctype = 0; parts[r>>8].tmp = parts[r>>8].ctype = 0;
if (ptypes[rt].explosive) if (ptypes[rt].explosive)
pv[y/CELL][x/CELL] += 0.25f * CFDS; pv[y/CELL][x/CELL] += 0.25f * CFDS;
continue;
} }
} }
if (legacy_enable) update_legacy_PYRO(UPDATE_FUNC_SUBCALL_ARGS); if (legacy_enable) update_legacy_PYRO(UPDATE_FUNC_SUBCALL_ARGS);