From 8c7755d5d220953c62c7a3677a695555e9126714 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Wed, 25 Jul 2012 20:04:47 +0100 Subject: [PATCH] TPT: Now stickmen can shoot plasma. dc01f09f0e --- src/simulation/elements/STKM.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp index 1dd3347a2..7f7476b2a 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 }