diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-01 19:17:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-01 19:17:04 (GMT) |
| commit | 4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7 (patch) | |
| tree | f1317cb1a771a558c065ede4af2048fcacd96583 /src/elements/stkm.c | |
| parent | 91f4a156dfabec29ae0dbcf445462259a266ab62 (diff) | |
| parent | 98e23875c83959957556a0859684b6770f76c996 (diff) | |
| download | powder-4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7.zip powder-4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements/stkm.c')
| -rw-r--r-- | src/elements/stkm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index e8a1241..be3506d 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -426,14 +426,18 @@ void STKM_interact(playerst* playerp, int i, int x, int y) parts[i].life -= 2; playerp->accs[3] -= 1; } - - if ((r&0xFF)==PT_ACID) //If on acid - parts[i].life -= 5; - - if ((r&0xFF)==PT_PLUT) //If on plut - parts[i].life -= 1; if (ptypes[r&0xFF].properties&PROP_DEADLY) + switch (r&0xFF) + { + case PT_ACID: + parts[i].life -= 5; + break; + default: + parts[i].life -= 1; + } + + if (ptypes[r&0xFF].properties&PROP_RADIOACTIVE) parts[i].life -= 1; if ((r&0xFF)==PT_PRTI && parts[i].type) |