diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-08-20 21:07:47 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-21 23:53:28 (GMT) |
| commit | 54ee10936de1251d1a6be3c2f4024af1e8f4ac02 (patch) | |
| tree | aebaafafb5f561bd2966d9d273f662db43db35e8 /src | |
| parent | d32ae818dc3533ef183e5448744e121ea11a857d (diff) | |
| download | powder-54ee10936de1251d1a6be3c2f4024af1e8f4ac02.zip powder-54ee10936de1251d1a6be3c2f4024af1e8f4ac02.tar.gz | |
Fix photons conducting heat to turned off HSWC
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c index 6d30e10..b6a6d3e 100644 --- a/src/powder.c +++ b/src/powder.c @@ -213,7 +213,7 @@ int try_move(int i, int x, int y, int nx, int ny) if ((r & 0xFF) == PT_COAL || (r & 0xFF) == PT_BCOL) parts[r>>8].temp = parts[i].temp; - if ((r & 0xFF) < PT_NUM && ptypes[r&0xFF].hconduct) + if ((r & 0xFF) < PT_NUM && ptypes[r&0xFF].hconduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10) && (r&0xFF)!=PT_FILT) parts[i].temp = parts[r>>8].temp = restrict_flt((parts[r>>8].temp+parts[i].temp)/2, MIN_TEMP, MAX_TEMP); } if (parts[i].type==PT_NEUT && ((r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN || (r&0xFF)==PT_BCLN || (r&0xFF)==PT_PBCN)) { |