summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-15 19:30:46 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-15 19:30:46 +0000
commit6becbd0e316bc98d9365829e8ec8c509b06af60a (patch)
tree0cb2c8ac339730c7f7aaa9fc1ab61149dac67e05 /crawl-ref/source/fight.cc
parent796a19d5b93e4ac9f5a224d21a6bb3b2048aad5a (diff)
downloadcrawl-ref-6becbd0e316bc98d9365829e8ec8c509b06af60a.tar.gz
crawl-ref-6becbd0e316bc98d9365829e8ec8c509b06af60a.zip
Simplify Beogh-worshipping check.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3653 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0faada5ee5..0d8d54cdc7 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -581,7 +581,7 @@ bool melee_attack::player_attack()
{
did_hit = true;
if (Options.tutorial_left)
- Options.tut_melee_counter++;
+ Options.tut_melee_counter++;
const bool shield_blocked = attack_shield_blocked(true);
@@ -596,12 +596,12 @@ bool melee_attack::player_attack()
bool hit_woke_orc = false;
if (you.religion == GOD_BEOGH && mons_species(def->type) == MONS_ORC
- && def->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
- && !player_under_penance() && you.piety >= piety_breakpoint(2))
+ && def->behaviour == BEH_SLEEP && !player_under_penance()
+ && you.piety >= piety_breakpoint(2))
{
hit_woke_orc = true;
}
-
+
// always upset monster regardless of damage
behaviour_event(def, ME_WHACK, MHITYOU);