diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-20 04:10:13 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-20 04:10:24 (GMT) |
| commit | 06fb97bc40e23af63557b6c1b6b50b7898fad1b0 (patch) | |
| tree | 17139c47ef85c7e40137da10df6c102a0d086139 /src/simulation | |
| parent | 53ae6ee517a4ac99698a804fe0f9f448e7120b7c (diff) | |
| download | powder-06fb97bc40e23af63557b6c1b6b50b7898fad1b0.zip powder-06fb97bc40e23af63557b6c1b6b50b7898fad1b0.tar.gz | |
fix BRMT always acting like it was created from TUGN
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Simulation.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
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; |