diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-10-13 18:37:20 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-14 17:04:58 (GMT) |
| commit | 8e877594c9f661c668606e99f078055d6babfd67 (patch) | |
| tree | 11bca8821cde8776f4146b82f213793f03e482a9 /src/elements/ligh.c | |
| parent | b32663f667ba36a5e105b013f0aa3150e846db46 (diff) | |
| download | powder-8e877594c9f661c668606e99f078055d6babfd67.zip powder-8e877594c9f661c668606e99f078055d6babfd67.tar.gz | |
Allow STKM to use lightning
Diffstat (limited to 'src/elements/ligh.c')
| -rw-r--r-- | src/elements/ligh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/ligh.c b/src/elements/ligh.c index f2b8a51..30ffad7 100644 --- a/src/elements/ligh.c +++ b/src/elements/ligh.c @@ -162,7 +162,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 || (r&0xFF)==PT_STKM2) + if (((r&0xFF)==PT_STKM && player[2]!=PT_LIGH) || ((r&0xFF)==PT_STKM2 && player2[2]!=PT_LIGH)) { parts[r>>8].life-=powderful/100; } |