diff options
| author | Simon <simon@hardwired.org.uk> | 2011-01-28 19:56:44 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-01-28 19:56:44 (GMT) |
| commit | 079d35f1a03088aca57be633f75c6e60d62a9fb3 (patch) | |
| tree | 220c8105b13a37192b08f2f64f863282ea745078 /src/powder.c | |
| parent | e9ae32b0ccba9d19dd872da547db1ff23b34a431 (diff) | |
| parent | 086e3151ad968b9c81f1b3b4391e5f9c42a1189c (diff) | |
| download | powder-079d35f1a03088aca57be633f75c6e60d62a9fb3.zip powder-079d35f1a03088aca57be633f75c6e60d62a9fb3.tar.gz | |
Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/powder.c b/src/powder.c index d595a5a..385ac5d 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1565,6 +1565,7 @@ void update_particles_i(pixel *vid, int start, int inc) } 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 (ptypes[t].state==ST_GAS&&ptypes[parts[i].type].state!=ST_GAS) @@ -1672,6 +1673,7 @@ void update_particles_i(pixel *vid, int start, int inc) } else s = 0; if (s) { // particle type change occurred + parts[i].life = 0; part_change_type(i,x,y,t); if (t==PT_FIRE) parts[i].life = rand()%50+120; |