diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-13 15:46:45 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-13 15:46:45 +0000 |
| commit | c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5 (patch) | |
| tree | ad68b92ce822cad4a7ba541282afdeba6b7fd9c4 /crawl-ref/source/religion.cc | |
| parent | d436eeaf8f01d5e9b0476254171b6a0bcc2c403d (diff) | |
| download | crawl-ref-c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5.tar.gz crawl-ref-c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5.zip | |
Remove atk and def from melee_attack.
Rewrite some code to use actor methods instead of calling things
directly. In theory, attacker_as_monster() and defender_as_monster()
are hacks; any calls to them that can be replaced by calls to actor
methods should be.
Fix some inconsistencies with monster bleeding and summoned creatures.
(This should probably go into actor::can_bleed().)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8444 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 3f5e4d2ff6..18d2dc91a4 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3170,7 +3170,7 @@ void set_attack_conducts(god_conduct_trigger conduct[3], const monsters *mon, else if (mons_neutral(mon)) conduct[0].set(DID_ATTACK_NEUTRAL, 5, known, mon); - if (is_unchivalric_attack(&you, mon, mon) + if (is_unchivalric_attack(&you, mon) && (_first_attack_conduct[midx] || _first_attack_was_unchivalric[midx])) { |