Added floor_special and floor_reserved to dngn_feature_names[], to make

the array match up with the enums.

Don't describe the weapon with which an unseen monster is attacking.

Added methods can_see() and visible_to() to the actor, player and
monster classes, which take care of calling mons_player_visible(),
player_monster_visible(), mons_monster_visible() and mons_near().

Re-arranged the first 12 dungeon_feature_type enumerations so that
similar features are contiguous (i.e., closed door and secret door are
next to each other), and added DNGN_MAXOPAQUE (one less than
DNGN_MINSEE), DNGN_MINWALL and DNGN_MAXWALL.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2293 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 0 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 4b033bb609..39b1dfc6e1 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2924,6 +2924,9 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
 
 std::string melee_attack::mons_weapon_desc()
 {
+    if (!you.can_see(attacker))
+        return ("");
+
     if (weapon && attacker->id() != MONS_DANCING_WEAPON)
     {
         std::string result = "";