summaryrefslogtreecommitdiff
path: root/src/elements/pipe.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-18 20:03:56 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-18 20:03:56 (GMT)
commit2ce377ef43cc142f963bdefe6e669f0372e29799 (patch)
tree7c4c97eb204b014e1c0e5698519860fafadf9287 /src/elements/pipe.cpp
parentd85049fb9338e46a8a8be326bf08c2b78dba55a1 (diff)
downloadpowder-2ce377ef43cc142f963bdefe6e669f0372e29799.zip
powder-2ce377ef43cc142f963bdefe6e669f0372e29799.tar.gz
TPT: Stop walls next to pipe triggering automatic pattern generation 76f49dd024
Diffstat (limited to 'src/elements/pipe.cpp')
-rw-r--r--src/elements/pipe.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/pipe.cpp b/src/elements/pipe.cpp
index 40ef411..78f384b 100644
--- a/src/elements/pipe.cpp
+++ b/src/elements/pipe.cpp
@@ -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] && sim->bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_ALLOWAIR && sim->bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_WALL && sim->bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_WALLELEC && (sim->bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_EWALL || sim->emap[(y+ry)/CELL][(x+rx)/CELL]))
parts[i].life=50;
}
}