diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-17 11:14:38 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-17 11:14:38 +0000 |
commit | a9632123fd30bffa305f9e8e2192568737533d54 (patch) | |
tree | 877471b1bc7bac0a3e171c93ba1afb851283877a /crawl-ref | |
parent | 9e58b2cf973bff6abb6514f9a3cc1a27c0f8d1e9 (diff) | |
download | crawl-ref-a9632123fd30bffa305f9e8e2192568737533d54.tar.gz crawl-ref-a9632123fd30bffa305f9e8e2192568737533d54.zip |
[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/trunk@654 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/invent.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/menu.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/travel.cc | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 1fb2b32d11..3c531604f9 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1244,7 +1244,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 6b680be9da..ebbf6a6bf0 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -824,7 +824,7 @@ int prompt_invent_item( const char *prompt, prompt, mtype, keyin == '*'? OSEL_ANY : type_expect, - MF_SINGLESELECT | MF_ANYPRINTABLE + 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 ce1eac47b7..164035089a 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 2e60997633..92687f4d7d 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -1796,11 +1796,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? @@ -1815,6 +1811,7 @@ static int prompt_travel_branch() return (-1 - (keyin - '0')); return (ID_CANCEL); } + mesclr(); } } |