diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 19:04:47 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 19:04:47 (GMT) |
| commit | 8c7755d5d220953c62c7a3677a695555e9126714 (patch) | |
| tree | 84f64930fa105effe13ba3ed1c0122d9e7a2108e /src/simulation/elements/STKM.cpp | |
| parent | 79727c91936197bbb62669d2dc4dbc0125c8a783 (diff) | |
| download | powder-8c7755d5d220953c62c7a3677a695555e9126714.zip powder-8c7755d5d220953c62c7a3677a695555e9126714.tar.gz | |
TPT: Now stickmen can shoot plasma. dc01f09f0e
Diffstat (limited to 'src/simulation/elements/STKM.cpp')
| -rw-r--r-- | src/simulation/elements/STKM.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp index 1dd3347..7f7476b 100644 --- a/src/simulation/elements/STKM.cpp +++ b/src/simulation/elements/STKM.cpp @@ -260,7 +260,10 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { if (!r && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL]) continue; - if (sim->elements[r&0xFF].Falldown!=0 || sim->elements[r&0xFF].State == ST_GAS || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT) + if (sim->elements[r&0xFF].Falldown!=0 || sim->elements[r&0xFF].State == ST_GAS + || sim->elements[r&0xFF].Properties&TYPE_GAS + || sim->elements[r&0xFF].Properties&TYPE_LIQUID + || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT) { playerp->elem = r&0xFF; //Current element } |