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

fix formatting in RFRG and RFGL

Browse Source
This commit is contained in:
jacob1 2016-09-10 12:56:12 -04:00
parent 6e6eb36bf5
commit f94b0489f5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulation/elements/RFGL.cpp
View File

@ -32,7 +32,7 @@ Element_RFGL::Element_RFGL()
Properties = TYPE_LIQUID|PROP_DEADLY; Properties = TYPE_LIQUID|PROP_DEADLY;
LowPressure = IPL; LowPressure = IPL;
LowPressureTransition = NT; LowPressureTransition = NT;
HighPressure = IPH; HighPressure = IPH;
HighPressureTransition = NT; HighPressureTransition = NT;

16
src/simulation/elements/RFRG.cpp
View File

@ -47,13 +47,15 @@ Element_RFRG::Element_RFRG()
//#TPT-Directive ElementHeader Element_RFRG static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_RFRG static int update(UPDATE_FUNC_ARGS)
int Element_RFRG::update(UPDATE_FUNC_ARGS) int Element_RFRG::update(UPDATE_FUNC_ARGS)
{ {
if (sim->pv[y/CELL][x/CELL] > 15) { if (sim->pv[y/CELL][x/CELL] > 15)
parts[i].temp += (sim->pv[y/CELL][x/CELL] - 15.0f) / 2.0f; {
if (parts[i].temp >= 343.15f) { parts[i].temp += (sim->pv[y/CELL][x/CELL] - 15.0f) / 2.0f;
sim->part_change_type(i, x, y, PT_RFGL); if (parts[i].temp >= 343.15f)
parts[i].life = 20; {
} sim->part_change_type(i, x, y, PT_RFGL);
} parts[i].life = 20;
}
}
return 0; return 0;
} }