Fixed turn-loss during travel:

- Interlevel travel was losing one turn when taking stairs.
- Greedy explore was losing one turn when picking up items.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1534 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 366ced7327..7f30600d45 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -811,7 +811,7 @@ static void handle_run_delays(const delay_queue_item &delay)
         return;
     }
 
-    if ( you.turn_is_over )
+    if (you.turn_is_over)
         return;
 
     command_type cmd = CMD_NO_CMD;
@@ -841,6 +841,12 @@ static void handle_run_delays(const delay_queue_item &delay)
         pop_delay();
         update_turn_count();
     }
+
+    if (you.running && !you.turn_is_over
+        && !is_run_delay(current_delay_action()))
+    {
+        handle_delay();
+    }
 }
 
 static void handle_macro_delay()