matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flatter surface when liquids solidify

Browse Source
This commit is contained in:
jacksonmj 2014-11-06 00:30:35 +00:00
parent 43bab359db
commit 829e2cca7d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simulation/Simulation.cpp
View File

@ -3294,6 +3294,7 @@ void Simulation::update_particles_i(int start, int inc)
unsigned int elem_properties;
float pGravX, pGravY, pGravD;
int excessive_stacking_found = 0;
bool transitionOccurred;
currentTick++;
@ -3840,6 +3841,8 @@ void Simulation::update_particles_i(int start, int inc)
}
#endif
transitionOccurred = false;
ctemph = ctempl = pt;
// change boiling point with pressure
if ((elements[t].State==ST_LIQUID && elements[t].HighTemperatureTransition>-1 && elements[t].HighTemperatureTransition<PT_NUM && elements[elements[t].HighTemperatureTransition].State==ST_GAS)
@ -4064,6 +4067,7 @@ void Simulation::update_particles_i(int start, int inc)
kill_part(i);
goto killed;
}
transitionOccurred = true;
}
pt = parts[i].temp = restrict_flt(parts[i].temp, MIN_TEMP, MAX_TEMP);
@ -4188,6 +4192,7 @@ void Simulation::update_particles_i(int start, int inc)
kill_part(i);
goto killed;
}
transitionOccurred = true;
}
//call the particle update function, if there is one
@ -4224,6 +4229,9 @@ killed:
if (parts[i].type == PT_NONE)//if its dead, skip to next particle
continue;
if (transitionOccurred)
continue;
if (!parts[i].vx&&!parts[i].vy)//if its not moving, skip to next particle, movement code it next
continue;