summaryrefslogtreecommitdiff
path: root/src/powder.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@Simons-Mac-Pro.local>2012-04-30 20:49:33 (GMT)
committer Simon Robertshaw <simon@Simons-Mac-Pro.local>2012-04-30 20:49:33 (GMT)
commit8397b6e51aa817f2b33347bc801fdaee0b4d2700 (patch)
treef41663184169ffd51c6c94e334371fed12c50f30 /src/powder.c
parenta75da2c4c3a4accdcbeab31a0416d6731040bda7 (diff)
downloadpowder-8397b6e51aa817f2b33347bc801fdaee0b4d2700.zip
powder-8397b6e51aa817f2b33347bc801fdaee0b4d2700.tar.gz
Add PROP_NOAMBHEAT to prevent certain elements from being heated by Ambient heat, Add PROP_NOAMBHEAT to FILT to fix http://powdertoy.co.uk/Discussions/Thread/View.html?Thread=13579
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index 354c788..f5b1f22 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1879,7 +1879,7 @@ void update_particles_i(pixel *vid, int start, int inc)
{
float c_Cm = 0.0f;
#endif
- if (aheat_enable)
+ if (aheat_enable && !(ptypes[t].properties&PROP_NOAMBHEAT))
{
#ifdef REALISTIC
c_heat = parts[i].temp*96.645/ptypes[t].hconduct*gel_scale*fabs(ptypes[t].weight)