* Make movement restrictions when beheld also apply to blinking and

  controlled teleport.
* Highlight restricted grids when beheld (ASCII only):
  - main screen: restricted grids in LOS are darkgrey
  - X screen: unrestricted grids in view around the mermaid(s) are lightgrey
* switch xx command back to leaving examine mode


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

1 files changed, 4 insertions, 6 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 6b84395f45..5f582fc35a 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -532,8 +532,11 @@ 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 (dam_level != MDAM_OKAY)
-                str = str + ", " + wound_str;
+                str += ", " + wound_str;
 
             // Wraparound if the description is longer than allowed.
             linebreak_string2(str, get_number_of_cols() - 8);
@@ -631,11 +634,6 @@ void full_describe_view()
             describe_item( *i );
         }
     }
-
-    // Repeat the prompt to show where we are.
-    mpr("Move the cursor around to observe a square "
-        "(x - list visible monsters and items, v - describe square, "
-        "? - help)", MSGCH_PROMPT);
 }