summaryrefslogtreecommitdiff
path: root/src/elements/wire.c
diff options
context:
space:
mode:
authorlieuwe <lieuwe@mint>2011-07-29 14:24:41 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-08 12:35:03 (GMT)
commitb1b3fbbc20580d8930061d1309907e286d636a68 (patch)
tree57c65f6e4ca8afe6216b5509c66bd14b94c40a45 /src/elements/wire.c
parent8f92829aab9e3c38f65e4f0f8d83a1293e237e54 (diff)
downloadpowder-b1b3fbbc20580d8930061d1309907e286d636a68.zip
powder-b1b3fbbc20580d8930061d1309907e286d636a68.tar.gz
added some metl->wire interaction, still working on wire->metl
Diffstat (limited to 'src/elements/wire.c')
-rw-r--r--src/elements/wire.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/wire.c b/src/elements/wire.c
index abdb982..1b5d150 100644
--- a/src/elements/wire.c
+++ b/src/elements/wire.c
@@ -22,7 +22,8 @@ int update_WIRE(UPDATE_FUNC_ARGS) {
if(x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && pmap[y+ry][x+rx] && (rx!=0 || ry!=0) && (pmap[y+ry][x+rx]&0xFF)!=0xFF)
{
r = pmap[y+ry][x+rx];
- if((r&0xFF)==PT_SPRK){parts[s>>8].ctype=1; return 0;}
+ if((r&0xFF)==PT_NSCN && parts[s>>8].tmp==1){create_part(-1, x+rx, y+ry, PT_SPRK);}
+ if((r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN){parts[s>>8].ctype=1; return 0;}
if((r&0xFF)==PT_WIRE && parts[r>>8].tmp==1){count++;}
}
}