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/DTEC.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/DTEC.cpp')
| -rw-r--r-- | src/simulation/elements/DTEC.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp index 6d67cf2..803e413 100644 --- a/src/simulation/elements/DTEC.cpp +++ b/src/simulation/elements/DTEC.cpp @@ -46,12 +46,6 @@ Element_DTEC::Element_DTEC() } -//#TPT-Directive ElementHeader Element_DTEC static int in_radius(int rd, int x, int y) -int Element_DTEC::in_radius(int rd, int x, int y) -{ - return (pow((double)x,2)*pow((double)rd,2)+pow((double)y,2)*pow((double)rd,2)<=pow((double)rd,2)*pow((double)rd,2)); -} - //#TPT-Directive ElementHeader Element_DTEC static int update(UPDATE_FUNC_ARGS) int Element_DTEC::update(UPDATE_FUNC_ARGS) { @@ -70,7 +64,7 @@ int Element_DTEC::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 && 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; |