Apply trunk r10224 to 0.5.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10225 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 17693fdc85..88df3d4958 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -753,7 +753,7 @@ void clear_macro_process_key_delay()
         _pop_delay();
 }
 
-void handle_delay( void )
+void handle_delay()
 {
     if (!you_are_delayed())
         return;
@@ -1416,6 +1416,12 @@ static void _finish_delay(const delay_queue_item &delay)
 #endif
 }
 
+void finish_last_delay()
+{
+    delay_queue_item &delay = you.delay_queue.front();
+    _finish_delay(delay);
+}
+
 void armour_wear_effects(const int item_slot)
 {
     const unsigned int old_talents = your_talents(false).size();