Reworded titles in overmap display per David's suggestions.

Also removed '_' as display notes since it's reachable by ? : now.


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

3 files changed, 3 insertions, 9 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 12d715e18f..3b4acebf86 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1054,10 +1054,6 @@ void process_command( command_type cmd ) {
         make_user_note();
         break;
 
-    case CMD_DISPLAY_NOTES:
-        display_notes();
-        break;
-
     case CMD_CLEAR_MAP:
         if (you.level_type != LEVEL_LABYRINTH &&
             you.level_type != LEVEL_ABYSS) {
@@ -2383,7 +2379,6 @@ command_type keycode_to_command( keycode_type key ) {
     case '%': return CMD_RESISTS_SCREEN;
     case ',': return CMD_PICKUP;
     case ':': return CMD_MAKE_NOTE;
-    case '_': return CMD_DISPLAY_NOTES;
     case ';': return CMD_INSPECT_FLOOR;
     case '!': return CMD_SHOUT;
     case '^': return CMD_DISPLAY_RELIGION;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 39821d0625..29db359ba7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -632,7 +632,6 @@ enum command_type
     CMD_TOGGLE_AUTOPRAYER,
     CMD_MAKE_NOTE,
     CMD_RESISTS_SCREEN,
-    CMD_DISPLAY_NOTES,
 
     /* overmap commands */
     CMD_MAP_CLEAR_MAP,
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index 8252d33580..08c343bf5f 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -222,7 +222,7 @@ std::string overview_description_string()
         {
             if ( !branchcount )
             {
-                disp += "\n<white>Branches:</white>\n";
+                disp += "\n<white>Branches:</white> (use <white>Ctrl-G</white> to reach them)\n";
                 seen_anything = true;
             }
             
@@ -249,7 +249,7 @@ std::string overview_description_string()
     // we loop through everything a dozen times, oh well
     if ( !notable_altars.empty() )
     {
-        disp += "\n<white>Altars:</white>\n";
+        disp += "\n<white>Altars:</white> (use <white>Ctrl-F \"altar\"</white> to reach them)\n";
         seen_anything = true;
     }
 
@@ -295,7 +295,7 @@ std::string overview_description_string()
     // print shops
     if (!shops_present.empty())
     {
-        disp += "\n<white>Shops:</white>\n";
+        disp +="\n<white>Shops:</white> (use <white>Ctrl-F \"shop\"</white> to reach them)\n";
         seen_anything = true;
     }
     last_id.depth = 10000;