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

TPT: Fixed the bug with snow, where it melted without taking it's ctype into account.

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-12 20:13:04 +01:00
parent 9b8fba4a19
commit f8badc05d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/simulation/Simulation.cpp
View File

@ -3283,7 +3283,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 || parts[i].ctype>=PT_NUM || parts[i].ctype==PT_ICEI))
if ((t==PT_ICEI || t==PT_SNOW) && (parts[i].ctype==0 || parts[i].ctype>=PT_NUM || parts[i].ctype==PT_ICEI || parts[i].ctype==PT_SNOW))
parts[i].ctype = PT_WATR;
if (ctemph>elements[t].HighTemperature&&elements[t].HighTemperatureTransition>-1) {
@ -3307,9 +3307,9 @@ void Simulation::update_particles_i(int start, int inc)
if (elements[t].HighTemperatureTransition!=PT_NUM)
t = elements[t].HighTemperatureTransition;
#endif
else if (t==PT_ICEI) {
if (parts[i].ctype<PT_NUM&&parts[i].ctype!=PT_ICEI) {
if (elements[parts[i].ctype].LowTemperatureTransition==PT_ICEI&&pt<=elements[parts[i].ctype].LowTemperature) s = 0;
else if (t==PT_ICEI || t==PT_SNOW) {
if (parts[i].ctype<PT_NUM&&parts[i].ctype!=t) {
if (elements[parts[i].ctype].LowTemperatureTransition==t&&pt<=elements[parts[i].ctype].LowTemperature) s = 0;
else {
#ifdef REALISTIC
//One ice table value for all it's kinds
@ -3414,7 +3414,7 @@ void Simulation::update_particles_i(int start, int inc)
}
#endif
if (s) { // particle type change occurred
if (t==PT_ICEI||t==PT_LAVA)
if (t==PT_ICEI||t==PT_LAVA||t==PT_SNOW)
parts[i].ctype = parts[i].type;
if (!(t==PT_ICEI&&parts[i].ctype==PT_FRZW)) parts[i].life = 0;
if (elements[t].State==ST_GAS&&elements[parts[i].type].State!=ST_GAS)

4
src/simulation/elements/SNOW.cpp
View File

@ -40,7 +40,7 @@ Element_SNOW::Element_SNOW()
LowTemperature = ITL;
LowTemperatureTransition = NT;
HighTemperature = 273.0f;
HighTemperatureTransition = PT_WATR;
HighTemperatureTransition = ST;
Update = &Element_SNOW::update;
Graphics = NULL;
@ -71,4 +71,4 @@ int Element_SNOW::update(UPDATE_FUNC_ARGS)
}
Element_SNOW::~Element_SNOW() {}
Element_SNOW::~Element_SNOW() {}