diff options
| author | Simon <simon@hardwired.org.uk> | 2011-04-04 15:09:05 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-04-04 15:09:05 (GMT) |
| commit | 651208c5fbba5d0703e174a6abe2c8a228730803 (patch) | |
| tree | 70eb10f704fddc06f4274fcac5729eb26bd6f162 /src | |
| parent | cf005403038a70ff68e1b54baa5c7a7daad81112 (diff) | |
| download | powder-651208c5fbba5d0703e174a6abe2c8a228730803.zip powder-651208c5fbba5d0703e174a6abe2c8a228730803.tar.gz | |
Prevent dust residue from FWRK
Conflicts:
src/powder.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/powder.c b/src/powder.c index be64760..b178318 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1382,7 +1382,7 @@ void update_particles_i(pixel *vid, int start, int inc) if (!(parts[i].life==10&&(t==PT_SWCH||t==PT_LCRY||t==PT_PCLN||t==PT_HSWC||t==PT_PUMP))) parts[i].life--; //this if is for stopping death when life hits 0 - if (parts[i].life<=0 && !(ptypes[t].properties&PROP_CONDUCTS) && t!=PT_ARAY && t!=PT_FIRW && t!=PT_SWCH && t!=PT_PCLN && t!=PT_HSWC && t!=PT_PUMP && t!=PT_SPRK && t!=PT_LAVA && t!=PT_LCRY && t!=PT_QRTZ && t!=PT_GLOW && t!= PT_FOG && t!=PT_PIPE && t!=PT_FRZW &&(t!=PT_ICEI&&parts[i].ctype!=PT_FRZW)&&t!=PT_INST && t!=PT_SHLD1&& t!=PT_SHLD2&& t!=PT_SHLD3&& t!=PT_SHLD4 && t!=PT_SING) + if (parts[i].life<=0 && !(ptypes[t].properties&PROP_CONDUCTS) && t!=PT_ARAY && t!=PT_FIRW && t!=PT_SWCH && t!=PT_PCLN && t!=PT_HSWC && t!=PT_PUMP && t!=PT_SPRK && t!=PT_LAVA && t!=PT_LCRY && t!=PT_QRTZ && t!=PT_GLOW && t!= PT_FOG && t!=PT_PIPE && t!=PT_FRZW &&!(t!=PT_ICEI&&parts[i].ctype!=PT_FRZW)&&t!=PT_INST && t!=PT_SHLD1&& t!=PT_SHLD2&& t!=PT_SHLD3&& t!=PT_SHLD4 && t!=PT_SING) { kill_part(i); continue; @@ -1591,13 +1591,12 @@ void update_particles_i(pixel *vid, int start, int inc) else s = 0; } else s = 0; - if (s) parts[i].life = 0; } else s = 0; if (s) { // particle type change occurred - parts[i].life = 0; if (t==PT_ICEI||t==PT_LAVA) parts[i].ctype = parts[i].type; + if (!(t==PT_ICEI&&parts[i].ctype==PT_FRZW)) parts[i].life = 0; if (ptypes[t].state==ST_GAS&&ptypes[parts[i].type].state!=ST_GAS) pv[y/CELL][x/CELL] += 0.50f; part_change_type(i,x,y,t); |