diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-02 17:37:59 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-02 17:49:56 (GMT) |
| commit | 5b1210714d3909139886cc7f8a72291580fc0eeb (patch) | |
| tree | 25ef9d98fc12239901e46054814fb9a77caf5a73 /src/elements/sprk.c | |
| parent | 77bcac1a5628aecdf8e4c1968106e3bed86890ab (diff) | |
| download | powder-5b1210714d3909139886cc7f8a72291580fc0eeb.zip powder-5b1210714d3909139886cc7f8a72291580fc0eeb.tar.gz | |
More fixes
Fix PHOT and FWRK.
Fix QRTZ conductivity (broken by removing PROP_CONDUCTS)
Add some things lost during rewrite: NTCT/PTCT not heated if INSL in the way;
boiling point varies with pressure.
Diffstat (limited to 'src/elements/sprk.c')
| -rw-r--r-- | src/elements/sprk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c index ddac968..39f7497 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -97,12 +97,12 @@ int update_SPRK(UPDATE_FUNC_ARGS) { // ct = spark from material, rt = spark to material. Make conduct_sprk = 0 if conduction not allowed if (pavg == PT_INSL) conduct_sprk = 0; - if (!(ptypes[rt].properties&PROP_CONDUCTS||rt==PT_INST)) conduct_sprk = 0; + if (!(ptypes[rt].properties&PROP_CONDUCTS||rt==PT_INST||rt==PT_QRTZ)) conduct_sprk = 0; if (abs(rx)+abs(ry)>=4 &&ct!=PT_SWCH&&rt!=PT_SWCH) conduct_sprk = 0; - if (ct==PT_METL && (rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR||(rt==PT_SPRK&&(parts[r>>8].ctype==PT_NTCT||parts[r>>8].ctype==PT_PTCT)))) + if (ct==PT_METL && (rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR||(rt==PT_SPRK&&(parts[r>>8].ctype==PT_NTCT||parts[r>>8].ctype==PT_PTCT))) && pavg!=PT_INSL) { parts[r>>8].temp = 473.0f; if (rt==PT_NTCT||rt==PT_PTCT) |