diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-26 14:20:16 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-26 14:20:16 (GMT) |
| commit | f97e8e5c7caddadadf71f7635070777c6e1248ad (patch) | |
| tree | e464320ea66c86ba2fc7e21ffff47893c5436c5d /src/elements/plnt.c | |
| parent | 4340b84499048cd45a5fd450a922965e878b1d59 (diff) | |
| parent | efc7565b6fb2958d7b50229178cd59835d06f9a0 (diff) | |
| download | powder-f97e8e5c7caddadadf71f7635070777c6e1248ad.zip powder-f97e8e5c7caddadadf71f7635070777c6e1248ad.tar.gz | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/elements/plnt.c')
| -rw-r--r-- | src/elements/plnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/plnt.c b/src/elements/plnt.c index 2ca38dd..5baec2f 100644 --- a/src/elements/plnt.c +++ b/src/elements/plnt.c @@ -20,7 +20,7 @@ int update_PLNT(UPDATE_FUNC_ARGS) { part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; } - else if ((r&0xFF)==PT_SMKE && (1>rand()%250)) + else if (((r&0xFF)==PT_SMKE || (r&0xFF)==PT_CO2) && (1>rand()%250)) { kill_part(r>>8); parts[i].life = rand()%60 + 60; |