From 851436e3e120efac69cb0cdb443a4cc3f30976d4 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 26 Nov 2008 17:08:12 +0000
Subject: [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
---
 crawl-ref/source/delay.cc | 5 +++++
 1 file changed, 5 insertions(+)

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

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)
-- 
cgit v1.2.3-54-g00ecf