summaryrefslogtreecommitdiff
path: root/src/elements/thdr.c
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-07 18:00:31 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-07 18:00:31 (GMT)
commitcb02bdfe214ceeb28795fa34ac0cee7ad30c658c (patch)
treed2bc2b532335f8b498b6f526e49214d81b7b2fbe /src/elements/thdr.c
parentaebcc0ebe4ba9a71ab6efedb679db6db599fff16 (diff)
downloadpowder-cb02bdfe214ceeb28795fa34ac0cee7ad30c658c.zip
powder-cb02bdfe214ceeb28795fa34ac0cee7ad30c658c.tar.gz
Rewrite electricity code.
Diffstat (limited to 'src/elements/thdr.c')
-rw-r--r--src/elements/thdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/thdr.c b/src/elements/thdr.c
index 3e6f2f7..3d46f9d 100644
--- a/src/elements/thdr.c
+++ b/src/elements/thdr.c
@@ -10,7 +10,7 @@ int update_THDR(UPDATE_FUNC_ARGS) {
r = pmap[y+ny][x+nx];
if ((r>>8)>=NPART || !r)
continue;
- if ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && !((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && parts[r>>8].ctype!=PT_SPRK)
+ if ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && parts[r>>8].life==0 && !((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && parts[r>>8].ctype!=PT_SPRK)
{
parts[i].type = PT_NONE;
parts[r>>8].ctype = parts[r>>8].type;