summaryrefslogtreecommitdiff
path: root/src/elements/stkm.c
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-05-26 16:19:40 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-04 18:12:21 (GMT)
commit7f245483a2683b67ceef6ce8aab3244b63b3888e (patch)
tree4e33d61d4f676135783eff8696c7f9627e8e9d04 /src/elements/stkm.c
parente42e7d019eb58caaab6369747fba872f74ca6293 (diff)
downloadpowder-7f245483a2683b67ceef6ce8aab3244b63b3888e.zip
powder-7f245483a2683b67ceef6ce8aab3244b63b3888e.tar.gz
Some fixes for stick mans.
Diffstat (limited to 'src/elements/stkm.c')
-rw-r--r--src/elements/stkm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index 9a8a1ff..8b19406 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -192,8 +192,10 @@ int update_STKM(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if (!r || (r>>8)>=NPART)
r = photons[y+ry][x+rx];
- if (!r || (r>>8)>=NPART)
+
+ if ((!r || (r>>8)>=NPART) && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue;
+
if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{
player[2] = r&0xFF; //Current element