diff options
| author | Simon <simon@hardwired.org.uk> | 2011-04-04 15:40:22 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-04-04 15:40:22 (GMT) |
| commit | 922befd8446ae3bdc8b3105bcf2f74e956ea386d (patch) | |
| tree | a087cd1e1fc765e8eebfeb3c9da2856562462333 /src/powder.c | |
| parent | 2f91bdb9bca011f354d0f9b752b915b3c4f88384 (diff) | |
| download | powder-922befd8446ae3bdc8b3105bcf2f74e956ea386d.zip powder-922befd8446ae3bdc8b3105bcf2f74e956ea386d.tar.gz | |
Fix O2 and H2 files, also fix zero life death
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c index 4ae5bca..deacfed 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1388,7 +1388,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; |