summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSavely Skresanov <savask@yandex.ru>2012-07-12 15:08:55 (GMT)
committer Savely Skresanov <savask@yandex.ru>2012-07-12 15:24:19 (GMT)
commitdc01f09f0e9785b576ba67f1c0b9e6fd5cd86eda (patch)
treeb0dd5264a07a2078c2ae354a9e7fb7d39f8a941e /src/elements
parent9e07825d5c3998ecb32bc030060c402b83e99f50 (diff)
downloadpowder-dc01f09f0e9785b576ba67f1c0b9e6fd5cd86eda.zip
powder-dc01f09f0e9785b576ba67f1c0b9e6fd5cd86eda.tar.gz
Now stickmen can shoot plasma.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/stkm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index 9271c54..bbb266d 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -229,7 +229,10 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
if (!r && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue;
- if (ptypes[r&0xFF].falldown!=0 || ptypes[r&0xFF].state == ST_GAS || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
+ if (ptypes[r&0xFF].falldown!=0 || ptypes[r&0xFF].state == ST_GAS
+ || ptypes[r&0xFF].properties&TYPE_GAS
+ || ptypes[r&0xFF].properties&TYPE_LIQUID
+ || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{
playerp->elem = r&0xFF; //Current element
}