mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-09 09:56:35 +02:00
Code Issues Projects Releases Wiki Activity

Fix bug with conservation of energy in RFGL (#338)

Browse Source
This commit is contained in:
cxi
2016-09-30 21:19:48 -07:00
committed by jacob1
parent 85e2516a42
commit ef9ef5bbce
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ int Element_RFGL::update(UPDATE_FUNC_ARGS)
if (pressure > -1 && pressure < 15 && parts[i].life > 0) if (pressure > -1 && pressure < 15 && parts[i].life > 0)
parts[i].life --; parts[i].life --;
if (parts[i].temp >= 323.15f + (pressure * 6.0f)) if (parts[i].temp >= 363.15f + (pressure * 6.0f))
sim->part_change_type(i, x, y, PT_RFRG); sim->part_change_type(i, x, y, PT_RFRG);
int r, rx, ry; int r, rx, ry;
@@ -65,7 +65,7 @@ int Element_RFGL::update(UPDATE_FUNC_ARGS)
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (!r) if (!r)
continue; continue;
if ((r&0xFF) == PT_RFGL) if ((r&0xFF) == PT_RFGL || (r&0xFF) == PT_RFRG)
{ {
float avgTemp = (parts[r>>8].temp + parts[i].temp) / 2; float avgTemp = (parts[r>>8].temp + parts[i].temp) / 2;
parts[r>>8].temp = avgTemp; parts[r>>8].temp = avgTemp;
@@ -78,10 +78,10 @@ int Element_RFGL::update(UPDATE_FUNC_ARGS)
parts[r>>8].temp = restrict_flt(parts[r>>8].temp + 80.0f, 0.0f, MAX_TEMP); parts[r>>8].temp = restrict_flt(parts[r>>8].temp + 80.0f, 0.0f, MAX_TEMP);
parts[i].temp = restrict_flt(parts[i].temp - 80.0f, 0.0f, MAX_TEMP); parts[i].temp = restrict_flt(parts[i].temp - 80.0f, 0.0f, MAX_TEMP);
} }
else if (parts[i].life == 0 && parts[r>>8].temp > 273.15f + 2.0f - (parts[i].tmp - 20.0f) && sim->elements[r&0xFF].HeatConduct) else if (parts[i].life == 0 && parts[r>>8].temp > 273.15f - 50.0f - (parts[i].tmp - 20.0f) && sim->elements[r&0xFF].HeatConduct)
{ {
parts[r>>8].temp -= restrict_flt(parts[r>>8].temp - 40.0f, 273.15f + 2.0f - (parts[i].tmp - 60.0f), MAX_TEMP); parts[r>>8].temp = restrict_flt(parts[r>>8].temp - 80.0f, 273.15f - 50.0f - (parts[i].tmp - 20.0f), MAX_TEMP);
parts[i].temp = restrict_flt(parts[i].temp + 40.0f, 0.0f, 343.15f); parts[i].temp = restrict_flt(parts[i].temp + 80.0f, 0.0f, 383.15f);
} }
} }
} }