From c6ed3e66570d031de512373ffc336234ce004b95 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Thu, 4 Jan 2007 17:40:20 +0000 Subject: item_ident(x, ISFLAG_KNOW_TYPE) is now deprecated in favour of item_type_known(x). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@786 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/delay.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'crawl-ref/source/delay.cc') diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index f48947e93f..f3c3b7f4f6 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -86,7 +86,14 @@ static void pop_delay() static void clear_pending_delays() { while (you.delay_queue.size() > 1) + { + const delay_queue_item delay = + you.delay_queue[you.delay_queue.size() - 1]; you.delay_queue.pop_back(); + + if (is_run_delay(delay.type) && you.running) + stop_running(); + } } void start_delay( int type, int turns, int parm1, int parm2 ) -- cgit v1.2.3-54-g00ecf