diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-02-04 16:00:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-02-05 14:45:30 (GMT) |
| commit | 06cb98f7050d99a07f128ece51302a8522bccfc5 (patch) | |
| tree | cf0051cec9f4c6ddf53e5381f57ea80dd4a0ddcd /src/elements | |
| parent | 72a4358eee003fef0a1e64ce223001f4bd1f1102 (diff) | |
| download | powder-06cb98f7050d99a07f128ece51302a8522bccfc5.zip powder-06cb98f7050d99a07f128ece51302a8522bccfc5.tar.gz | |
INSL blocks DLAY conduction, and raise DLAY temperature limit
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/dlay.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/elements/dlay.c b/src/elements/dlay.c index cb2e2d8..bc0a07b 100644 --- a/src/elements/dlay.c +++ b/src/elements/dlay.c @@ -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 || 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) { |