summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-12 22:47:16 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-12 22:47:16 +0000
commit7a66364b0a9a5ee83119698e5d84b8293d3b3b62 (patch)
tree06539d816f9848f0f190c38df9e70d89bac3b778 /crawl-ref/source/player.cc
parent53c6ceba3b668484834997f285d25cffa0c07eca (diff)
downloadcrawl-ref-7a66364b0a9a5ee83119698e5d84b8293d3b3b62.tar.gz
crawl-ref-7a66364b0a9a5ee83119698e5d84b8293d3b3b62.zip
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
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index f796518b40..7a66a9538a 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6416,7 +6416,8 @@ int player::melee_evasion(const actor *act) const
{
return (player_evasion()
- ((!act || act->visible()) ? 0 : 10)
- - (you_are_delayed()? 5 : 0));
+ - (you_are_delayed()
+ && !is_run_delay(current_delay_action())? 5 : 0));
}
void player::heal(int amount, bool max_too)