diff options
| author | Pekka Lampila <pekka.lampila@iki.fi> | 2014-02-20 23:06:40 +0200 |
|---|---|---|
| committer | Pekka Lampila <pekka.lampila@iki.fi> | 2014-02-20 23:07:16 +0200 |
| commit | 960dfbfcc3df1c7fd10a1d6460eba302b79fd028 (patch) | |
| tree | b1d44dc285d232e1c7194ee70422620614e185c4 /crawl-ref/source/fight.cc | |
| parent | 7f0ab476c6a4c103963807983bd393e1a9d35d9c (diff) | |
| download | crawl-ref-960dfbfcc3df1c7fd10a1d6460eba302b79fd028.tar.gz crawl-ref-960dfbfcc3df1c7fd10a1d6460eba302b79fd028.zip | |
Fix a crash in is_unchivalric_attack. (gammafunk)
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index de5d7ba5b0..23747288cb 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -438,7 +438,7 @@ unchivalric_attack_type is_unchivalric_attack(const actor *attacker, unchivalric = UCAT_CONFUSED; // allies - if (def && def->friendly() && attacker->is_player() + if (def && def->friendly() && attacker && attacker->is_player() && god_hates_attacking_friend(you.religion, defender)) { unchivalric = UCAT_ALLY; |