Moving main monster descriptions out of describe.cc and into mon-data.h

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

1 files changed, 8 insertions, 5 deletions

diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index e88991a638..3a87523ea3 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -18,6 +18,7 @@
 
 #include "AppHdr.h"
 #include "direct.h"
+#include "format.h"
 
 #include <cstdarg>
 #include <stdlib.h>
@@ -1449,7 +1450,7 @@ static void describe_cell(int mx, int my)
 {
     char  str_pass[ ITEMNAME_SIZE ];
     bool  mimic_item = false;
-
+    
     if (mgrd[mx][my] != NON_MONSTER)
     {
         int i = mgrd[mx][my];
@@ -1472,9 +1473,12 @@ static void describe_cell(int mx, int my)
 
         const int mon_wep = menv[i].inv[MSLOT_WEAPON];
         const int mon_arm = menv[i].inv[MSLOT_ARMOUR];
-
-        mprf("%s.", ptr_monam(&(menv[i]), DESC_CAP_A));
-
+        const char *longDesc = mons_longDesc(menv[i].type);
+        if (longDesc && longDesc != "") {
+            mprf("%s. ('v' to describe)", ptr_monam(&(menv[i]), DESC_CAP_A));
+        } else {
+            mprf("%s.", ptr_monam(&(menv[i]), DESC_CAP_A));
+        }
         if (menv[i].type != MONS_DANCING_WEAPON && mon_wep != NON_ITEM)
         {
             snprintf( info, INFO_SIZE, "%s is wielding ",
@@ -1552,7 +1556,6 @@ static void describe_cell(int mx, int my)
         {
             describe_mons_enchantment(menv[i], *e, paralysed);
         }
-
 #if DEBUG_DIAGNOSTICS
         stethoscope(i);
 #endif