diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-02 08:01:04 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-02 08:01:04 +0000 |
| commit | 2f55bb611d1d8ba115b57efce9aa054479d33a15 (patch) | |
| tree | 6a0d0cf64f9cbb5c1087eac64d058f49b4b45d39 /crawl-ref/source/fight.cc | |
| parent | a33e5fa47d9fee51bed481a0a6271193955bec92 (diff) | |
| download | crawl-ref-2f55bb611d1d8ba115b57efce9aa054479d33a15.tar.gz crawl-ref-2f55bb611d1d8ba115b57efce9aa054479d33a15.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9310 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 15aaf56c80..c2d54f9c7c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -858,7 +858,7 @@ bool melee_attack::player_attack() bool hit_woke_orc = false; if (you.religion == GOD_BEOGH && defender->mons_species() == MONS_ORC - && !mons_is_summoned(defender_as_monster()) + && !defender->is_summoned() && !mons_is_shapeshifter(defender_as_monster()) && !player_under_penance() && you.piety >= piety_breakpoint(2) && mons_near(defender_as_monster()) && defender->asleep()) @@ -4678,6 +4678,7 @@ void melee_attack::mons_perform_attack_rounds() bleed_onto_floor(pos, type, blood, true); } + if (decapitate_hydra(damage_done, attacker->damage_type(attack_number))) { |