summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/attack.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2014-01-09 23:52:29 +0100
committerAdam Borowski <kilobyte@angband.pl>2014-01-10 01:27:07 +0100
commit24a3214df1667af2ace3bf1a9439df1da44168ff (patch)
tree3291f5ea697a8bcabc91163cbdc40e98ec4a4f01 /crawl-ref/source/attack.h
parent3799b74068533f8d74f8b9f5eb0d762eb7f62c93 (diff)
downloadcrawl-ref-24a3214df1667af2ace3bf1a9439df1da44168ff.tar.gz
crawl-ref-24a3214df1667af2ace3bf1a9439df1da44168ff.zip
Remove redundancy: {attack,defend}er_visible vs {attack,defend}er_invisible.
They could go out of sync only if a monster somehow managed to make a reaching attack through three clouds: impossible because a) current max reach is 2, b) no one can attack out of LOS. And while a) may change, I don't see b) ever getting allowed. And even if they did go out sync, the only result would be an attacker/defender showing up as "something" rather than "it".
Diffstat (limited to 'crawl-ref/source/attack.h')
-rw-r--r--crawl-ref/source/attack.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h
index 7b9d96a6f2..58a4131f98 100644
--- a/crawl-ref/source/attack.h
+++ b/crawl-ref/source/attack.h
@@ -16,14 +16,13 @@ class attack
public:
// General attack properties, set on instantiation or through a normal
// thread of execution
- actor *attacker, *defender;
+ actor *attacker, *defender;
bool attack_occurred;
bool cancel_attack;
bool did_hit;
bool needs_message;
bool attacker_visible, defender_visible;
- bool attacker_invisible, defender_invisible;
int to_hit;
int damage_done;
@@ -90,9 +89,9 @@ public:
// Exact copies of their melee_attack predecessors
string actor_name(const actor *a, description_level_type desc,
- bool actor_visible, bool actor_invisible);
+ bool actor_visible);
string actor_pronoun(const actor *a, pronoun_type ptyp, bool actor_visible);
- string anon_name(description_level_type desc, bool actor_invisible);
+ string anon_name(description_level_type desc);
string anon_pronoun(pronoun_type ptyp);
// Private Methods