[1616535] Fixed broken inscription hotkeying with auto_list.

Fixed interlevel travel prompt ugliness.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 38460be2b8..81d702e782 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1252,7 +1252,7 @@ void process_command( command_type cmd ) {
             break;
         }
         start_translevel_travel();
-        redraw_screen();
+        mesclr();
         break;
 
     case CMD_EXPLORE:
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 7aa9b5c2c8..d46425c248 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -815,8 +815,8 @@ int prompt_invent_item( const char *prompt,
                         prompt,
                         mtype,
                         keyin == '*'? OSEL_ANY : type_expect, 
-                        MF_SINGLESELECT | MF_ANYPRINTABLE
-                            | MF_EASY_EXIT, 
+                        MF_SINGLESELECT | MF_ANYPRINTABLE | MF_NO_SELECT_QTY
+                        | MF_EASY_EXIT,
                         NULL, 
                         &items );
 
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 05f4fa2c77..1041e8f494 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -220,8 +220,11 @@ bool Menu::process_key( int keyin )
             return false;
         draw_select_count( sel.size() );
 
-        if (flags & MF_ANYPRINTABLE && !isdigit( keyin ))
+        if (flags & MF_ANYPRINTABLE
+            && (!isdigit(keyin) || is_set(MF_NO_SELECT_QTY)))
+        {
             return false;
+        }
 
         break;
     }
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index fde93fa9c6..0796d42c3c 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -1615,11 +1615,7 @@ static int prompt_travel_branch()
             return (ID_DOWN);
         case '*':
             if (waypoint_list || waycount)
-            {
                 waypoint_list = !waypoint_list;
-                mesclr();
-                continue;
-            }
             break;
         default:
             // Is this a branch hotkey?
@@ -1634,6 +1630,7 @@ static int prompt_travel_branch()
                 return (-1 - (keyin - '0'));
             return (ID_CANCEL);
         }
+        mesclr();
     }
 }