diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 17:33:34 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 17:33:34 (GMT) |
| commit | 4ddf723167aa4d07b16ef1aaac6b4dff16c87a42 (patch) | |
| tree | 26f0b9ad4281fa8ab45693b099ead3890fcb9bd1 /src/elements/sprk.cpp | |
| parent | bc4a3355de313d8fe928d2c8abed66108d141efa (diff) | |
| download | powder-4ddf723167aa4d07b16ef1aaac6b4dff16c87a42.zip powder-4ddf723167aa4d07b16ef1aaac6b4dff16c87a42.tar.gz | |
TPT: prevent ionizing NBLE and burning H2 during fusion 83d4658589
Diffstat (limited to 'src/elements/sprk.cpp')
| -rw-r--r-- | src/elements/sprk.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/elements/sprk.cpp b/src/elements/sprk.cpp index 149d63b..e01c774 100644 --- a/src/elements/sprk.cpp +++ b/src/elements/sprk.cpp @@ -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; sim->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) { |