diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 16:28:37 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 16:28:37 (GMT) |
| commit | e68d14a5bf2177495ceb071dfa85d3d2e63b93eb (patch) | |
| tree | 5ab6145fb1cf1756f506013cd142ec69230d138c /src/elements/dlay.cpp | |
| parent | fe5ae5e7928a8b6f9d51ba6d53b1be1444e12b9b (diff) | |
| download | powder-e68d14a5bf2177495ceb071dfa85d3d2e63b93eb.zip powder-e68d14a5bf2177495ceb071dfa85d3d2e63b93eb.tar.gz | |
TPT: INSL blocks DLAY conduction, and raise DLAY temperature limit 06cb98f705
Diffstat (limited to 'src/elements/dlay.cpp')
| -rw-r--r-- | src/elements/dlay.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/elements/dlay.cpp b/src/elements/dlay.cpp index 06b59d9..fe2d175 100644 --- a/src/elements/dlay.cpp +++ b/src/elements/dlay.cpp @@ -7,17 +7,17 @@ int update_DLAY(UPDATE_FUNC_ARGS) { parts[i].life--; //if (parts[i].life==1) //{ - if (parts[i].temp>=256.0+273.15) - parts[i].temp=256.0+273.15; - if (parts[i].temp<= -256.0+273.15) - parts[i].temp = -256.0+273.15; + if (parts[i].temp>=MAX_TEMP+273.15f) + parts[i].temp = MAX_TEMP+273.15f; + if (parts[i].temp<= 1.0f+273.15f) + parts[i].temp = 1.0f+273.15f; for (rx=-2; rx<3; rx++) for (ry=-2; ry<3; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { r = pmap[y+ry][x+rx]; - if (!r) + if (!r || sim->parts_avg(r>>8, i,PT_INSL)==PT_INSL) continue; if ((r&0xFF)==PT_SPRK && parts[i].life==0 && parts[r>>8].life>0 && parts[r>>8].life<4 && parts[r>>8].ctype==PT_PSCN) { |