diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-18 19:55:10 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-18 19:55:10 (GMT) |
| commit | b236c75209c45bddf51f6911593d27779dd621e2 (patch) | |
| tree | eb73becb499ecbedad620669840b357a8583e154 /src/simulation/elements/TSNS.cpp | |
| parent | 771d71ea4619f30bd1b135697e83037ba333008f (diff) | |
| download | powder-b236c75209c45bddf51f6911593d27779dd621e2.zip powder-b236c75209c45bddf51f6911593d27779dd621e2.tar.gz | |
make TSNS not detect METL, some other sensor and CONV fixes
Diffstat (limited to 'src/simulation/elements/TSNS.cpp')
| -rw-r--r-- | src/simulation/elements/TSNS.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp index d5c8aa7..a4abbaf 100644 --- a/src/simulation/elements/TSNS.cpp +++ b/src/simulation/elements/TSNS.cpp @@ -64,7 +64,7 @@ int Element_TSNS::update(UPDATE_FUNC_ARGS) rt = parts[r>>8].type; if (sim->parts_avg(i,r>>8,PT_INSL) != PT_INSL) { - if ((sim->elements[rt].Properties&PROP_CONDUCTS) && !(rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR) && parts[r>>8].life==0 && Element_DTEC::in_radius(rd, rx, ry)) + if ((sim->elements[rt].Properties&PROP_CONDUCTS) && !(rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR) && parts[r>>8].life==0) { parts[r>>8].life = 4; parts[r>>8].ctype = rt; @@ -82,7 +82,7 @@ int Element_TSNS::update(UPDATE_FUNC_ARGS) r = sim->photons[y+ry][x+rx]; if(!r) continue; - if (parts[r>>8].temp > parts[i].temp && parts[r>>8].type != PT_TSNS) + if (parts[r>>8].temp > parts[i].temp && parts[r>>8].type != PT_TSNS && parts[i].type != PT_METL) parts[i].life = 1; } return 0; |