summaryrefslogtreecommitdiff
path: root/src/elements/ligh.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-10-26 16:10:21 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-26 16:10:21 (GMT)
commite2c9882692fabcd22a7d022ebd21fd3b36ad84b0 (patch)
tree0afb6c4c35985625484d87adcdda40004910a3ff /src/elements/ligh.c
parent4742c1bcd9103e93751b67a831403a66dc411804 (diff)
parent60de1cf5754d8132a7bf5b6868df34babe66397b (diff)
downloadpowder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.zip
powder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.tar.gz
Merge latest FIGH additions
Diffstat (limited to 'src/elements/ligh.c')
-rw-r--r--src/elements/ligh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/ligh.c b/src/elements/ligh.c
index ea4e5ca..0fb700e 100644
--- a/src/elements/ligh.c
+++ b/src/elements/ligh.c
@@ -165,7 +165,7 @@ int update_LIGH(UPDATE_FUNC_ARGS)
}
if (ptypes[r&0xFF].hconduct)
parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/10, MIN_TEMP, MAX_TEMP);
- if (((r&0xFF)==PT_STKM && player[2]!=PT_LIGH) || ((r&0xFF)==PT_STKM2 && player2[2]!=PT_LIGH))
+ if (((r&0xFF)==PT_STKM && player.elem!=PT_LIGH) || ((r&0xFF)==PT_STKM2 && player2.elem!=PT_LIGH))
{
parts[r>>8].life-=powderful/100;
}