Fix 2011201: Disallow summoned orcs from joining a worshipper of Beogh.

Fix 2011258: Consolidate named orcs correctly in the monster list.
Fix 2010542: Patrolling monsters forgetting the player too quickly.


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

1 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index a3eadda080..aaa206bd50 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1272,7 +1272,11 @@ void monster_pane_info::to_string( int count, std::string& desc,
     if (count == 1)
     {
         if (!mons_is_mimic(m_mon->type))
+        {
             out << m_mon->name(DESC_PLAIN);
+            if (!(m_mon->mname).empty())
+                out << " the " << mons_type_name(m_mon->type, DESC_PLAIN);
+        }
         else
             out << mons_type_name(m_mon->type, DESC_PLAIN);
     }
@@ -1282,7 +1286,8 @@ void monster_pane_info::to_string( int count, std::string& desc,
         // of different types.
         if (m_fullname
             && m_mon->type != MONS_DANCING_WEAPON
-            && !mons_is_mimic(m_mon->type))
+            && !mons_is_mimic(m_mon->type)
+            && m_mon->mname.empty())
         {
             out << count << " "
                 << pluralise(m_mon->name(DESC_PLAIN));