summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorCate <cate@cate-6sh2.(none)>2011-07-12 15:28:33 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-07-12 17:46:33 (GMT)
commitd3452b01c8aad35e6d55523323247eeb114dc7d1 (patch)
tree82eae01ee6e63d47b944ad0eb53937100d5a73af /src/elements
parent7480442c67682c40672dd862a921972e816ce59e (diff)
downloadpowder-d3452b01c8aad35e6d55523323247eeb114dc7d1.zip
powder-d3452b01c8aad35e6d55523323247eeb114dc7d1.tar.gz
OMG FIXES. Lots of fixes for triangle brush to make sure it works, from Cracker. Edited CLST to prevent "popcorning" when its float hits weird numbers. Also fixed it so it freezes nicely when cooled. Fingers are back! :DDD
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/clst.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/elements/clst.c b/src/elements/clst.c
index db0eb7c..15b5624 100644
--- a/src/elements/clst.c
+++ b/src/elements/clst.c
@@ -16,7 +16,16 @@ int update_CLST(UPDATE_FUNC_ARGS) {
}
if ((r&0xFF)==PT_CLST)
{
- parts[i].vx += 0.01*rx; parts[i].vy += 0.01*ry;
+ if(parts[i].temp <195)
+ cxy = 0.05;
+ if(parts[i].temp >= 195 && parts[i].temp <295)
+ cxy = 0.015;
+ if(parts[i].temp >= 295 && parts[i].temp <350)
+ cxy = 0.01;
+ if(parts[i].temp > 350)
+ cxy = 0.005;
+ parts[i].vx += cxy*rx;
+ parts[i].vy += cxy*ry;//These two can be set not to calculate over 350 later. They do virtually nothing over 0.005.
}
}
return 0;