0.1.7 backport:

* GOD_GIFT was not set for TSO and Zin minions.
* Turn counter display.
* New temple levels.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.7@738 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 0d354cf287..ae2c75a3aa 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -215,6 +215,9 @@ void stop_delay( void )
     default:
         break;
     }
+
+    if (is_run_delay(delay.type))
+        update_turn_count();
 }
 
 bool you_are_delayed( void )
@@ -741,6 +744,7 @@ static void handle_run_delays(const delay_queue_item &delay)
     // We don't want to send the game into a deadlock.
     if (!you.running)
     {
+        update_turn_count();
         pop_delay();
         return;
     }
@@ -769,7 +773,10 @@ static void handle_run_delays(const delay_queue_item &delay)
     // removed, remove it now. This is needed to clean up after
     // find_travel_pos() function in travel.cc.
     if (!you.running && is_run_delay(current_delay_action()))
+    {
         pop_delay();
+        update_turn_count();
+    }
 }
 
 static void handle_macro_delay()