summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-09 07:35:26 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-09 07:35:26 +0000
commit56e8efa47fb107b49d33a62a923a340b3df98e49 (patch)
treea721bd9244c8d7815163b505a8cbb1c21d19aca2 /crawl-ref
parentfe135a4986670c7b47cd6f386f8853f9f7a74d6b (diff)
downloadcrawl-ref-56e8efa47fb107b49d33a62a923a340b3df98e49.tar.gz
crawl-ref-56e8efa47fb107b49d33a62a923a340b3df98e49.zip
Paladins don't confirm strikes when berserk (1715386.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1431 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/fight.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 3e66e306b7..b3d0b7dc18 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2243,7 +2243,7 @@ void melee_attack::player_stab_check()
if (stab_attempt && roll_needed)
stab_attempt = (random2(130) <= you.skills[SK_STABBING] + you.dex);
- if (stab_attempt && you.religion == GOD_SHINING_ONE)
+ if (stab_attempt && you.religion == GOD_SHINING_ONE && !you.berserker)
{
if (!yesno("Really attack this helpless creature?", false, 'n'))
{