matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Prevent photons stealing heat energy"

Browse Source 
This reverts commit aac8898f42.
This commit is contained in:
Simon Robertshaw 2011-06-15 13:10:45 +01:00
parent bcb7852762
commit daa67b13bd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/powder.c
View File

@ -1646,7 +1646,7 @@ void update_particles_i(pixel *vid, int start, int inc)
if ((r>>8)>=NPART || !r) if ((r>>8)>=NPART || !r)
continue; continue;
rt = r&0xFF; rt = r&0xFF;
if (rt&&ptypes[rt].hconduct&&ptypes[rt].weight>0&&(rt!=PT_HSWC||parts[r>>8].life==10) if (rt&&ptypes[rt].hconduct&&(rt!=PT_HSWC||parts[r>>8].life==10)
&&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG)) &&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG))
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG))) &&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG)))
{ {
@ -1657,7 +1657,8 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
} }
pt = parts[i].temp = (c_heat+parts[i].temp*96.645/ptypes[t].hconduct*ptypes[t].weight)/(c_Cm+96.645/ptypes[t].hconduct*ptypes[t].weight); pt = parts[i].temp = (c_heat+parts[i].temp*96.645/ptypes[t].hconduct*ptypes[t].weight)
/(c_Cm+96.645/ptypes[t].hconduct*ptypes[t].weight);
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
parts[surround_hconduct[j]].temp = pt; parts[surround_hconduct[j]].temp = pt;