summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Wallin <nibbler.v1@gmail.com>2010-10-02 18:46:17 (GMT)
committer Felix Wallin <nibbler.v1@gmail.com>2010-10-02 18:46:17 (GMT)
commitd80f3e346b493c46855442609f1c3962af13be3a (patch)
tree587a41cdc14c99314d42d4cce0e21ae9311686c3 /src
parent7692ee51fc38428e0fa894310b065752472ae8f1 (diff)
downloadpowder-d80f3e346b493c46855442609f1c3962af13be3a.zip
powder-d80f3e346b493c46855442609f1c3962af13be3a.tar.gz
fixed temperature transfers, Skylark
Diffstat (limited to 'src')
-rw-r--r--src/powder.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c
index c84d71c..cdad9b0 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -75,12 +75,11 @@ int try_move(int i, int x, int y, int nx, int ny)
e = eval_move(parts[i].type, nx, ny, &r);
if(!e) {
if(!legacy_enable && parts[i].type==PT_PHOT) {
- if((r >> 8) < PT_NUM)
+ if((r & 0xFF ) < PT_NUM)
parts[i].temp = parts[r>>8].temp =
restrict_flt((parts[r>>8].temp+parts[i].temp)/2, MIN_TEMP, MAX_TEMP);
}
return 0;
- return 0;
}
if(e == 2)
return 1;