summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorlieuwe <lieuwe@mint>2011-07-29 14:52:05 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-08 12:37:28 (GMT)
commitdd2d06425e80193d3bf59df0d2600d21bdde49ce (patch)
tree013664d3ec33534bf83d7e2565e8d002b43737a0 /src/elements
parentb1b3fbbc20580d8930061d1309907e286d636a68 (diff)
downloadpowder-dd2d06425e80193d3bf59df0d2600d21bdde49ce.zip
powder-dd2d06425e80193d3bf59df0d2600d21bdde49ce.tar.gz
you can now charge WIRE with pscn and it'll create only one
electron.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/dlay.c4
-rw-r--r--src/elements/wire.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/src/elements/dlay.c b/src/elements/dlay.c
index 9e88320..2a248ca 100644
--- a/src/elements/dlay.c
+++ b/src/elements/dlay.c
@@ -42,10 +42,6 @@ int update_DLAY(UPDATE_FUNC_ARGS) {
{
create_part(-1, x+rx, y+ry, PT_SPRK);
}
- else if((r&0xFF)==PT_WIRE && oldl==1)
- {
- parts[r>>8].ctype=1;
- }
}
//}
return 0;
diff --git a/src/elements/wire.c b/src/elements/wire.c
index 1b5d150..920ddc9 100644
--- a/src/elements/wire.c
+++ b/src/elements/wire.c
@@ -22,8 +22,7 @@ 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_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_SPRK && parts[r>>8].ctype==PT_PSCN){parts[s>>8].ctype=1; parts[r>>8].life=0; return 0;}
if((r&0xFF)==PT_WIRE && parts[r>>8].tmp==1){count++;}
}
}