Fix 2038651: real/fake rakshasa identity being leaked by monster pane window

and 'x' description.


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

1 files changed, 8 insertions, 2 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 74b1143a49..095f917f1d 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2803,8 +2803,14 @@ std::string get_monster_desc(const monsters *mon, bool full_desc,
 
     std::string weap = "";
 
-    if (mon->type != MONS_DANCING_WEAPON)
+    // We don't report rakshasa equipment in order not to give away the
+    // true rakshasa when it summons.
+
+    if (mon->type != MONS_DANCING_WEAPON
+        && (mon->type != MONS_RAKSHASA || mons_friendly(mon)))
+    {
         weap = _describe_monster_weapon(mon);
+    }
 
     if (!weap.empty())
     {
@@ -2814,7 +2820,7 @@ std::string get_monster_desc(const monsters *mon, bool full_desc,
     }
 
     // Print the rest of the equipment only for full descriptions.
-    if (full_desc)
+    if (full_desc && (mon->type != MONS_RAKSHASA || mons_friendly(mon)))
     {
         const int mon_arm = mon->inv[MSLOT_ARMOUR];
         const int mon_shd = mon->inv[MSLOT_SHIELD];