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

fix HEAC conducting to HSWC which is turned off

Browse Source
This commit is contained in:
jacob1
2017-07-23 21:17:21 -04:00
parent 3c4ca5cd4b
commit bf9014ac60
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/simulation/elements/HEAC.cpp
View File

@@ -136,13 +136,13 @@ int Element_HEAC::update(UPDATE_FUNC_ARGS)
if (x+rrx >= 0 && x+rrx < XRES && y+rry >= 0 && y+rry < YRES && !Element_HEAC::CheckLine<Element_HEAC::IsInsulator>(sim, x, y, x+rrx, y+rry, isInsulator)) if (x+rrx >= 0 && x+rrx < XRES && y+rry >= 0 && y+rry < YRES && !Element_HEAC::CheckLine<Element_HEAC::IsInsulator>(sim, x, y, x+rrx, y+rry, isInsulator))
{ {
r = pmap[y+rry][x+rrx]; r = pmap[y+rry][x+rrx];
if (r && sim->elements[r&0xFF].HeatConduct > 0) if (r && sim->elements[r&0xFF].HeatConduct > 0 && (parts[r>>8].type != PT_HSWC || parts[r>>8].life == 10))
{ {
count++; count++;
tempAgg += parts[r>>8].temp; tempAgg += parts[r>>8].temp;
} }
r = sim->photons[y+rry][x+rrx]; r = sim->photons[y+rry][x+rrx];
if (r && sim->elements[r&0xFF].HeatConduct > 0) if (r && sim->elements[r&0xFF].HeatConduct > 0 && (parts[r>>8].type != PT_HSWC || parts[r>>8].life == 10))
{ {
count++; count++;
tempAgg += parts[r>>8].temp; tempAgg += parts[r>>8].temp;
@@ -164,12 +164,12 @@ int Element_HEAC::update(UPDATE_FUNC_ARGS)
if (x+rrx >= 0 && x+rrx < XRES && y+rry >= 0 && y+rry < YRES && !Element_HEAC::CheckLine<Element_HEAC::IsInsulator>(sim, x, y, x+rrx, y+rry, isInsulator)) if (x+rrx >= 0 && x+rrx < XRES && y+rry >= 0 && y+rry < YRES && !Element_HEAC::CheckLine<Element_HEAC::IsInsulator>(sim, x, y, x+rrx, y+rry, isInsulator))
{ {
r = pmap[y+rry][x+rrx]; r = pmap[y+rry][x+rrx];
if (r && sim->elements[r&0xFF].HeatConduct > 0) if (r && sim->elements[r&0xFF].HeatConduct > 0 && (parts[r>>8].type != PT_HSWC || parts[r>>8].life == 10))
{ {
parts[r>>8].temp = parts[i].temp; parts[r>>8].temp = parts[i].temp;
} }
r = sim->photons[y+rry][x+rrx]; r = sim->photons[y+rry][x+rrx];
if (r && sim->elements[r&0xFF].HeatConduct > 0) if (r && sim->elements[r&0xFF].HeatConduct > 0 && (parts[r>>8].type != PT_HSWC || parts[r>>8].life == 10))
{ {
parts[r>>8].temp = parts[i].temp; parts[r>>8].temp = parts[i].temp;
} }