Fix bug 2803113: mutant jackals swiveling their eyestalks towards you if you

use the 0.3.4 glyph settings.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9938 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 9eeb3c1a86..c29c9c2ffe 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1122,15 +1122,20 @@ void handle_monster_shouts(monsters* monster, bool force)
         msg = getShoutString(default_msg_key, suffix);
     else if (msg.empty())
     {
+        // NOTE: Use the hardcoded glyph rather than that returned
+        // by mons_char(), since the result of mons_char() can be
+        // changed by user settings.
+        char mchar = get_monster_data(monster->type)->showchar;
+
         // See if there's a shout for all monsters using the
         // same glyph/symbol
         std::string glyph_key = "'";
 
         // Database keys are case-insensitve.
-        if (isupper(mons_char(monster->type)))
+        if (isupper(mchar))
             glyph_key += "cap-";
 
-        glyph_key += mons_char(monster->type);
+        glyph_key += mchar;
         glyph_key += "'";
         msg = getShoutString(glyph_key, suffix);