summaryrefslogtreecommitdiff
path: root/src/elements/sprk.c
diff options
context:
space:
mode:
authorJacob1 <jfu614@gmail.com>2012-03-14 23:33:10 (GMT)
committer Jacob1 <jfu614@gmail.com>2012-03-14 23:33:10 (GMT)
commit83d4658589d366a8a708d64c912c128bcebb9d1c (patch)
tree487f6e796b397a185fe8abc927a218d247e6d33e /src/elements/sprk.c
parent446f773542c2a025a86b0d022c086efbdb86474d (diff)
downloadpowder-83d4658589d366a8a708d64c912c128bcebb9d1c.zip
powder-83d4658589d366a8a708d64c912c128bcebb9d1c.tar.gz
prevent ionizing NBLE and burning H2 during fusion
Diffstat (limited to 'src/elements/sprk.c')
-rw-r--r--src/elements/sprk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 0ca666f..00279f5 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -44,7 +44,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
parts[nearp].ctype = PT_ETRD;
}
}
- else if (ct==PT_NBLE&&parts[i].life<=1)
+ else if (ct==PT_NBLE&&parts[i].life<=1&&parts[i].tmp!=1)
{
parts[i].life = rand()%150+50;
part_change_type(i,x,y,PT_PLSM);
@@ -179,6 +179,8 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
conduct_sprk = 0;
if (rt==PT_INST&&ct!=PT_PSCN)
conduct_sprk = 0;
+ if (rt == PT_NBLE && parts[r>>8].tmp == 1)
+ conduct_sprk = 0;
if (conduct_sprk) {
if (rt==PT_WATR||rt==PT_SLTW) {