summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-11-02 15:17:49 (GMT)
committer savask <savask@yandex.ru>2011-11-02 15:22:27 (GMT)
commit7de6526a1e545d258a0c83ceab7acc6ca89d6b98 (patch)
tree90afb0b34ea3a43b0c0b3a18f70fbe03e0ded17c /src/elements
parentf53fdaa1c2fa0cab17c66e5e1c0732e7f16b543b (diff)
downloadpowder-7de6526a1e545d258a0c83ceab7acc6ca89d6b98.zip
powder-7de6526a1e545d258a0c83ceab7acc6ca89d6b98.tar.gz
CAUS now kills stick man. Also stick mans can have gas power now.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/stkm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index be3506d..f1de549 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -210,7 +210,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
if (!r && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue;
- if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
+ if (ptypes[r&0xFF].falldown!=0 || ptypes[r&0xFF].state == ST_GAS || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{
playerp->elem = r&0xFF; //Current element
}