summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-12 17:58:31 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-12 17:58:31 +0000
commit3947969b0bdd2e27e2e6c98efc4850e9caae974c (patch)
tree0585877eb95e84429f64bb98fb62a9dfc39aef96 /crawl-ref/source/player.cc
parent7b83fd125f30d8479760be243d6c8cc83438b622 (diff)
downloadcrawl-ref-3947969b0bdd2e27e2e6c98efc4850e9caae974c.tar.gz
crawl-ref-3947969b0bdd2e27e2e6c98efc4850e9caae974c.zip
Fixed shield bonus when confused (syllogism).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3259 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ed1f96de09..8ce441481a 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5874,6 +5874,10 @@ int player::shield_bonus() const
const int shield_class = player_shield_class();
if (!shield_class)
return (-100);
+
+ // Note that 0 is not quite no-blocking.
+ if (incapacitated())
+ return (0);
int stat = 0;
if (const item_def *sh = const_cast<player*>(this)->shield())