summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/attack.h
diff options
context:
space:
mode:
authorRobert Burnham <burnhamrobertp@gmail.com>2011-11-03 11:41:42 -0500
committerRobert Burnham <burnhamrobertp@gmail.com>2011-11-04 15:27:57 -0500
commitf508d0ad0b937f5881c9c9f18d42a8821c3d6cf7 (patch)
treec889b781ff3051d2541aeead207adbc64896329d /crawl-ref/source/attack.h
parent5521ed493c3cbbc8645e0ba7b61c4794c511beab (diff)
downloadcrawl-ref-f508d0ad0b937f5881c9c9f18d42a8821c3d6cf7.tar.gz
crawl-ref-f508d0ad0b937f5881c9c9f18d42a8821c3d6cf7.zip
Move some variables from melee_attack to attack
Diffstat (limited to 'crawl-ref/source/attack.h')
-rw-r--r--crawl-ref/source/attack.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h
index 25b12ef57b..dbf0148b5d 100644
--- a/crawl-ref/source/attack.h
+++ b/crawl-ref/source/attack.h
@@ -73,9 +73,14 @@ public:
std::string special_damage_message;
std::string aux_attack, aux_verb;
- // Fetched/Calculated from the defender, stored to save execution time
- int defender_body_armour_penalty;
- int defender_shield_penalty;
+ // Adjusted EV penalties for defender and attacker
+ int defender_body_armour_penalty;
+ int defender_shield_penalty;
+ int attacker_body_armour_penalty;
+ int attacker_shield_penalty;
+ // Combined to-hit penalty from armour and shield.
+ int attacker_armour_tohit_penalty;
+ int attacker_shield_tohit_penalty;
item_def *defender_shield;