* Rename beheld -> mesmerised.

* Fix forget_map routine for Tiles.
  There are two problems remaining:
    a) Calling forget_map every ~20 turns is fine for ASCII since it
       mostly happens outside vision range anyway but looks really odd 
       and spurious when watched in the minimap.
       Potential solution: Call the function more often.
    b) The minimap currently does not recenter but of course it should
       from time to time. The problem with this is that this is likely
       to look wobbly.
       Potential solution: Disable the minimap entirely while in 
                           labyrinths.

I don't like the solutions I came up with, so if anyone has a better
idea please speak up.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 6e86640ed7..276b60266c 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -533,8 +533,8 @@ void full_describe_view()
             std::vector<formatted_string> fss;
             std::string str = get_monster_desc(list_mons[i], true, DESC_CAP_A,
                                                true);
-            if (player_beheld_by(list_mons[i]))
-                str += ", beholding you";
+            if (player_mesmerised_by(list_mons[i]))
+                str += ", keeping you mesmerised";
 
             if (dam_level != MDAM_OKAY)
                 str += ", " + wound_str;
@@ -2772,8 +2772,8 @@ static void _describe_monster(const monsters *mon)
     std::string text = get_monster_desc(mon) + ".";
     print_formatted_paragraph(text, numcols);
 
-    if (player_beheld_by(mon))
-        mpr("You are beheld by her song.", MSGCH_EXAMINE);
+    if (player_mesmerised_by(mon))
+        mpr("You are mesmerised by her song.", MSGCH_EXAMINE);
 
     print_wounds(mon);