From 7a66364b0a9a5ee83119698e5d84b8293d3b3b62 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 12 Nov 2008 22:47:16 +0000
Subject: Added crawl.process_keys to user Lua API to allow a Lua macro to ask
 Crawl to process keystrokes immediately, i.e., not wait until the macro has
 finished running. Also removed player EV penalty during run/rest/travel.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7443 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/acr.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/acr.cc')

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 7f3502d00e..166c029f5c 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1502,7 +1502,7 @@ static void _input()
 
     _center_cursor();
 
-    if (you_are_delayed())
+    if (you_are_delayed() && current_delay_action() != DELAY_MACRO_PROCESS_KEY)
     {
         if (you.time_taken)
             _world_reacts();
@@ -1534,6 +1534,8 @@ static void _input()
         cursor_control con(true);
 #endif
 
+        clear_macro_process_key_delay();
+
         crawl_state.waiting_for_command = true;
         c_input_reset(true);
 
-- 
cgit v1.2.3-54-g00ecf