summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.h
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-30 20:46:19 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-30 20:46:19 +0530
commit8c843e4cf5e57ce79f206f9f0c34eaea3bb6a290 (patch)
treecab3d940ddbe9a0ef1d26a244c44d25056fc4273 /crawl-ref/source/fight.h
parentd4f1aa480a206f57f0cc6f846cfa8bfdfa629b0c (diff)
downloadcrawl-ref-8c843e4cf5e57ce79f206f9f0c34eaea3bb6a290.tar.gz
crawl-ref-8c843e4cf5e57ce79f206f9f0c34eaea3bb6a290.zip
Don't combine armour and shields when reporting what made the PC miss a melee attack.
Diffstat (limited to 'crawl-ref/source/fight.h')
-rw-r--r--crawl-ref/source/fight.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 5318fb9afa..96e16c33dd 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -131,7 +131,8 @@ public:
int player_shield_penalty;
// Combined to-hit penalty from armour and shield.
- int player_armshld_tohit_penalty;
+ int player_armour_tohit_penalty;
+ int player_shield_tohit_penalty;
bool can_do_unarmed;
@@ -241,7 +242,7 @@ private:
int player_stat_modify_damage(int damage);
int player_aux_stat_modify_damage(int damage);
int player_to_hit(bool random_factor);
- int player_armour_shield_tohit_penalty(bool random_factor) const;
+ void calc_player_armour_shield_tohit_penalty(bool random_factor);
void player_apply_attack_delay();
int player_apply_weapon_bonuses(int damage);
int player_apply_weapon_skill(int damage);