diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-26 17:08:12 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-26 17:08:12 +0000 |
| commit | 851436e3e120efac69cb0cdb443a4cc3f30976d4 (patch) | |
| tree | 233ed6e09c96c915c9ed514413ba48233ffc503d /crawl-ref/source/delay.cc | |
| parent | 13d0f16c1a40183c0561bd1ca6d5ac645788cd30 (diff) | |
| download | crawl-ref-851436e3e120efac69cb0cdb443a4cc3f30976d4.tar.gz crawl-ref-851436e3e120efac69cb0cdb443a4cc3f30976d4.zip | |
[2123909] Fix Lua macros wasting turns.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7638 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 75e1950f73..3f3c62a1cc 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1501,6 +1501,11 @@ static void _handle_run_delays(const delay_queue_item &delay) static void _handle_macro_delay() { run_macro(); + + // Macros may not use up turns, but unless we zero time_taken, + // acr.cc will call world_reacts and increase turn count. + if (!you.turn_is_over && you.time_taken) + you.time_taken = 0; } void run_macro(const char *macroname) |