diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-05-04 20:43:43 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-05-04 20:43:43 (GMT) |
| commit | 3799d5ed86e7b508b39544cad3b3346655c804f1 (patch) | |
| tree | 96ad9594f79b31b2ee7f4c5d37d0d2365ed2fd37 /src/simulation/Simulation.cpp | |
| parent | 2d8c5a77472159229d920041878e09c003c84ecd (diff) | |
| parent | 36efb4864412537ff4a48a99337f220d601acc70 (diff) | |
| download | powder-3799d5ed86e7b508b39544cad3b3346655c804f1.zip powder-3799d5ed86e7b508b39544cad3b3346655c804f1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index c738fce..499748d 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4001,6 +4001,9 @@ void Simulation::update_particles_i(int start, int inc) if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) { if (parts[i].ctype==PT_THRM&&pt>=elements[PT_BMTL].HighTemperature) s = 0; else if ((parts[i].ctype==PT_VIBR || parts[i].ctype==PT_BVBR) && pt>=273.15f) s = 0; + else if (parts[i].ctype==PT_TUGN) { + if (pt>3695.0) s = 0; + } else if (elements[parts[i].ctype].HighTemperatureTransition==PT_LAVA) { if (pt>=elements[parts[i].ctype].HighTemperature) s = 0; } |