diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-13 14:36:05 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-13 14:36:05 (GMT) |
| commit | 9f067224b82751e94d0ad377d9653ce160daa03d (patch) | |
| tree | 751d5e17fd14fbf200c77c0eed173eee91f34c12 /src/elements | |
| parent | d601608623c0e8a26ceca0186743cf2ea89c08f4 (diff) | |
| parent | a1bd20db91d9e1e2a9523986927afcbb82171205 (diff) | |
| download | powder-9f067224b82751e94d0ad377d9653ce160daa03d.zip powder-9f067224b82751e94d0ad377d9653ce160daa03d.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/pipe.c b/src/elements/pipe.c index 1607a0b..b387b7d 100644 --- a/src/elements/pipe.c +++ b/src/elements/pipe.c @@ -215,7 +215,7 @@ int update_PIPE(UPDATE_FUNC_ARGS) { for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { - if (!pmap[y+ry][x+rx]) + if (!pmap[y+ry][x+rx] && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_ALLOWAIR && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_WALL && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_WALLELEC && (bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_EWALL || emap[(y+ry)/CELL][(x+rx)/CELL])) parts[i].life=50; } } |