summaryrefslogtreecommitdiff
path: root/src/elements/pyro.cpp
diff options
context:
space:
mode:
authorSimon 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)
commit4ddf723167aa4d07b16ef1aaac6b4dff16c87a42 (patch)
tree26f0b9ad4281fa8ab45693b099ead3890fcb9bd1 /src/elements/pyro.cpp
parentbc4a3355de313d8fe928d2c8abed66108d141efa (diff)
downloadpowder-4ddf723167aa4d07b16ef1aaac6b4dff16c87a42.zip
powder-4ddf723167aa4d07b16ef1aaac6b4dff16c87a42.tar.gz
TPT: prevent ionizing NBLE and burning H2 during fusion 83d4658589
Diffstat (limited to 'src/elements/pyro.cpp')
-rw-r--r--src/elements/pyro.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/pyro.cpp b/src/elements/pyro.cpp
index 92d4d8c..6ffe644 100644
--- a/src/elements/pyro.cpp
+++ b/src/elements/pyro.cpp
@@ -46,7 +46,7 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
(t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) &&
(t!=PT_PHOT || rt!=PT_INSL) &&
(rt!=PT_SPNG || parts[r>>8].life==0) &&
- (rt!=PT_H2 || parts[r>>8].tmp!=1) &&
+ (rt!=PT_H2 || (parts[r>>8].temp < 2273.15 && sim->pv[y/CELL][x/CELL] < 50.0f)) &&
sim->ptypes[rt].flammable && (sim->ptypes[rt].flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
{
sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE);