diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 20:05:14 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 20:05:14 (GMT) |
| commit | ea37facf83bae0b25b3826e04f7da2f7ee8e889d (patch) | |
| tree | 3a68dbdeefceaa69c10cf67bc11354205cd817ed /src/simulation/Simulation.cpp | |
| parent | bfb37563ca8cdc37709abd1fa0b32f465e2d7ae8 (diff) | |
| download | powder-ea37facf83bae0b25b3826e04f7da2f7ee8e889d.zip powder-ea37facf83bae0b25b3826e04f7da2f7ee8e889d.tar.gz | |
TPT: No unmeltable ice anymore. e4448dc1d6
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 0f0cd9c..017925a 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2689,7 +2689,7 @@ void Simulation::update_particles_i(int start, int inc) s = 1; //A fix for ice with ctype = 0 - if (t==PT_ICEI && parts[i].ctype==0) + if (t==PT_ICEI && (parts[i].ctype==0 || parts[i].ctype>=PT_NUM || parts[i].ctype==PT_ICEI)) parts[i].ctype = PT_WATR; if (ctemph>ptransitions[t].thv&&ptransitions[t].tht>-1) { |
