diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-16 17:34:43 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-16 17:34:43 +0000 |
| commit | 03c498835e827368791edd1076f72bfbfcdf05c7 (patch) | |
| tree | 21e881be15bcc94f7440252d22eee3b0a3b46b76 /crawl-ref/source | |
| parent | cfa1009c4b69e7f42264d9b8d3e1ead97239e12f (diff) | |
| download | crawl-ref-03c498835e827368791edd1076f72bfbfcdf05c7.tar.gz crawl-ref-03c498835e827368791edd1076f72bfbfcdf05c7.zip | |
Add a few more miscellaneous cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3673 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/fight.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 0d8d54cdc7..3c767268d1 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -630,18 +630,18 @@ bool melee_attack::player_attack() if (player_check_monster_died()) return (true); + player_sustain_passive_damage(); + + // At this point, pretend we didn't hit at all. + if (shield_blocked) + did_hit = false; + if (hit_woke_orc) { // call function of orcs first noticing you but with // beaten-up conversion messages (if applicable) beogh_follower_convert(def, true); } - - player_sustain_passive_damage(); - - // At this point, pretend we didn't hit at all. - if (shield_blocked) - did_hit = false; } else player_warn_miss(); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 0af9e58596..c54c312fc7 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -474,9 +474,9 @@ static bool monster_avoided_death(monsters *monster, killer_type killer, int i) if (YOU_KILL(killer) && mons_near(monster) && !mons_friendly(monster) + && you.religion == GOD_BEOGH && mons_species(monster->type) == MONS_ORC - && you.species == SP_HILL_ORC && you.religion == GOD_BEOGH - && !player_under_penance() && you.piety >= 75) + && !player_under_penance() && you.piety >= piety_breakpoint(2)) { #ifdef DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "Death convert attempt on %s, HD: %d, " |