* Fix tiles 'V' crashing for mimics and dancing weapons.

* Display wound/attitude overlays.


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

1 files changed, 18 insertions, 2 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 30432cd59a..c004d28f99 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -563,6 +563,7 @@ void full_describe_view()
             std::vector<formatted_string> fss;
             std::string str = get_monster_equipment_desc(list_mons[i], true,
                                                          DESC_CAP_A, true);
+
             if (player_mesmerised_by(list_mons[i]))
                 str += ", keeping you mesmerised";
 
@@ -3041,10 +3042,25 @@ std::string get_monster_equipment_desc(const monsters *mon, bool full_desc,
 
         if (print_attitude)
         {
+            std::string str = "";
             if (mons_friendly(mon))
-                desc += " (friendly)";
+                str = "friendly";
             else if (mons_neutral(mon))
-                desc += " (neutral)";
+                str = "neutral";
+
+            if (mon->type == MONS_DANCING_WEAPON
+                || mons_is_known_mimic(mon))
+            {
+                if (!str.empty())
+                    str += " ";
+
+                if (mon->type == MONS_DANCING_WEAPON)
+                    str += "dancing weapon";
+                else
+                    str += "mimic";
+            }
+            if (!str.empty())
+                desc += " (" + str + ")";
         }
     }