diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 11:58:07 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 11:58:07 +0000 |
| commit | 2695f313b764e05d416d31f90ff913eca7fb9a32 (patch) | |
| tree | 941cbdc3c2013b67b6b8124fa64a1f3ee42ea4fe /crawl-ref/source/abl-show.cc | |
| parent | 9ac3b8f9fc0c7217e75ec38bdac887fb421fcf4f (diff) | |
| download | crawl-ref-2695f313b764e05d416d31f90ff913eca7fb9a32.tar.gz crawl-ref-2695f313b764e05d416d31f90ff913eca7fb9a32.zip | |
Make Escape cancel out of menu and prompt for the ability and spellcasting menus (Marc).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2373 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index be68ecf8fd..77ebf6ab4a 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -844,6 +844,11 @@ bool activate_ability() if ( keyin == '?' || keyin == '*' ) { selected = choose_ability_menu(talents); + if (selected == -1) + { + canned_msg( MSG_OK ); + return (false); + } } else if (keyin == ESCAPE || keyin == ' ' || keyin == '\r' || keyin == '\n') @@ -1820,7 +1825,9 @@ int choose_ability_menu(const std::vector<talent>& talents) { Menu abil_menu(MF_SINGLESELECT | MF_ANYPRINTABLE); abil_menu.set_highlighter(NULL); - abil_menu.set_title(new MenuEntry(" Ability Cost Success")); + abil_menu.set_title( + new MenuEntry(" Ability " + "Cost Success")); int numbers[52]; for ( int i = 0; i < 52; ++i ) |