diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 17 |
2 files changed, 13 insertions, 6 deletions
@@ -11,7 +11,7 @@ *.lua stdout.txt stderr.txt -build/* +build*/* stamps/* Saves/* generated/* diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index e696581..fedb989 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -3854,13 +3854,20 @@ void Simulation::update_particles_i(int start, int inc) } else if (t == PT_BRMT) { - if (parts[i].ctype == PT_TUNG && ctemph <= 3695.0) - s = 0; - else + if (parts[i].ctype == PT_TUNG) { - t = PT_LAVA; - parts[i].type = PT_TUNG; + if (ctemph <= 3695.0) + s = 0; + else + { + t = PT_LAVA; + parts[i].type = PT_TUNG; + } } + else if (ctemph >= elements[t].HighTemperature) + t = PT_LAVA; + else + s = 0; } else s = 0; |