diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 19:38:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 19:38:46 +0000 |
| commit | 5006c1e3f3d193c18cd2bf76a50163fbab1b8052 (patch) | |
| tree | ed1423d4a2f0aaa58dc281d5c6fbfcaa3bc7040e /crawl-ref/source/overmap.cc | |
| parent | 3d4a6ad0b4146eb7a4540cc66474efceadbf9c12 (diff) | |
| download | crawl-ref-5006c1e3f3d193c18cd2bf76a50163fbab1b8052.tar.gz crawl-ref-5006c1e3f3d193c18cd2bf76a50163fbab1b8052.zip | |
Fix 2017251: The annotation prompt not escaping properly.
Fix 2016627: Ranged weapons of protection autoIDing when wielded by
monsters.
Fix the double prompt when using Ctrl-P in the quivering interface (part
of BR 2017260), fix targetting via monster list to be turned off if
there are no monsters in sight, and map auto-travel to both G and
Ctrl-G. (The monster list command moves to V.) Again, I'm not sure I got
all the relevant documentation.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6529 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/overmap.cc')
| -rw-r--r-- | crawl-ref/source/overmap.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc index 158590d297..580c7b9426 100644 --- a/crawl-ref/source/overmap.cc +++ b/crawl-ref/source/overmap.cc @@ -631,7 +631,7 @@ void annotate_level() li = li2; else if (li2 != level_id::current()) { - if (yesno("Annotate level on other end of current stairs?")) + if (yesno("Annotate level on other end of current stairs?", true, 'n')) li = li2; } @@ -644,7 +644,8 @@ void annotate_level() mpr( "Set level annotation to what? ", MSGCH_PROMPT ); char buf[77]; - cancelable_get_line( buf, sizeof(buf) ); + if (cancelable_get_line( buf, sizeof(buf) )) + return; if (strlen(buf) == 0) { |