diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-05 08:41:22 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-05 08:41:22 +0000 |
commit | 739361a8ab7f6a7a3d22c5461e8b903957e57d50 (patch) | |
tree | 3a06392013a7833d00739e43efc7be3fbfafef9b /crawl-ref | |
parent | 4180d6f661122b16d50addcbbe671f87903cd1dd (diff) | |
download | crawl-ref-739361a8ab7f6a7a3d22c5461e8b903957e57d50.tar.gz crawl-ref-739361a8ab7f6a7a3d22c5461e8b903957e57d50.zip |
Allow for ESC clearing --more-- until you get control back to work for resting
and other delays.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8240 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/acr.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/delay.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 3c95861220..a285f6a0ee 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1535,7 +1535,8 @@ static void _input() } // Stop autoclearing more now that we have control back. - reset_more_autoclear(); + if (!you_are_delayed()) + reset_more_autoclear(); if (need_to_autopickup()) autopickup(); diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 83bff93763..482e61f524 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -334,6 +334,8 @@ void stop_delay( bool stop_stair_travel ) if (you.delay_queue.empty()) return; + reset_more_autoclear(); + ASSERT(!crawl_state.arena); delay_queue_item delay = you.delay_queue.front(); |