diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 22:28:38 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 22:37:09 +0200 |
| commit | e9c4ad3ff54b7cf9f7f05c5cd58c03cd605663b5 (patch) | |
| tree | ad0ed71df5199621865338e4bef5e722777bf86f /crawl-ref/source/fight.cc | |
| parent | 1fdd4abbce290f4d656bf29ce65d70ab5025871d (diff) | |
| download | crawl-ref-e9c4ad3ff54b7cf9f7f05c5cd58c03cd605663b5.tar.gz crawl-ref-e9c4ad3ff54b7cf9f7f05c5cd58c03cd605663b5.zip | |
Rename actor::visible to actor::observable.
This should reduce potential for confusion -- compare mon->visible() and
mon->invisible(). The uses of actor::visible for messaging are replaced by
actor::observable, others by you.can_see(...) or actor::visible_to(&you).
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 3b9ffbfdfe..a1d8bbc914 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -389,10 +389,9 @@ void melee_attack::init_attack() defender_shield = defender->shield(); water_attack = is_water_attack(attacker, defender); - attacker_visible = attacker->visible() || crawl_state.arena; + attacker_visible = attacker->observable(); attacker_invisible = (!attacker_visible && see_cell(attacker->pos())); - defender_visible = (defender && (defender->visible() - || crawl_state.arena)); + defender_visible = defender && defender->observable(); defender_invisible = (!defender_visible && defender && see_cell(defender->pos())); needs_message = (attacker_visible || defender_visible); |