diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-21 06:37:39 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-21 06:37:39 +0000 |
commit | cf72d214ea56a4198e4fd9817cde7c7bef45622f (patch) | |
tree | 0bb445a27608d24e3565324ee013595ec2ef526f /crawl-ref/source/acr.cc | |
parent | 8a71071e3d9dd698f31846f2261e5b77ca7085c8 (diff) | |
download | crawl-ref-cf72d214ea56a4198e4fd9817cde7c7bef45622f.tar.gz crawl-ref-cf72d214ea56a4198e4fd9817cde7c7bef45622f.zip |
If the user presses ESC in response to --more-- then automatically clear
all --more--s until the player can enter a command again, the player gets
a prompt, or an error message is given.
Move where activity is interrupted on error messages, and also do that
for error messages sent through formatted_mpr().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7893 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index f8b9d9572f..e87e5ab535 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1524,6 +1524,9 @@ static void _input() return; } + // Stop autoclearing more now that we have control back. + reset_more_autoclear(); + if (need_to_autopickup()) autopickup(); |