summaryrefslogtreecommitdiff
path: root/src/elements/elec.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-03-15 01:52:23 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-03-15 01:52:23 (GMT)
commit7a454d4d729a5715a7c1e71dfbaf303471bf8d1f (patch)
tree234cb5ba80e5227ecc5dc7c7e9b4845444e5f1a9 /src/elements/elec.c
parentb4a06df0b2264c690f0161b099c2c5a2c11f8b3b (diff)
parentbf5484ca63f0ee5165b394f98d91e16089f657a2 (diff)
downloadpowder-7a454d4d729a5715a7c1e71dfbaf303471bf8d1f.zip
powder-7a454d4d729a5715a7c1e71dfbaf303471bf8d1f.tar.gz
Merge pull request #57 from jacob1/test
Bug fixes + Some stuff from jacob1's mod
Diffstat (limited to 'src/elements/elec.c')
-rw-r--r--src/elements/elec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/elec.c b/src/elements/elec.c
index 6acbbab..a5c254f 100644
--- a/src/elements/elec.c
+++ b/src/elements/elec.c
@@ -79,7 +79,7 @@ int update_ELEC(UPDATE_FUNC_ARGS) {
kill_part(i);
return 1;
}
- if (ptypes[r&0xFF].properties & PROP_CONDUCTS)
+ if (ptypes[r&0xFF].properties & PROP_CONDUCTS && ((r&0xFF)!=PT_H2||parts[i].tmp!=1))
{
create_part(-1, x+rx, y+ry, PT_SPRK);
kill_part(i);