summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-04 14:23:33 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-04 14:23:33 +0000
commit4f8425fbbcbc232d6c009eaa391e362492bc9ddf (patch)
tree23cd94c97885024dfaaafa305fd7218e7cf1910b /crawl-ref/source/delay.cc
parentab138e22e1d27e8e5ee28b6469b43f756f1b3150 (diff)
downloadcrawl-ref-4f8425fbbcbc232d6c009eaa391e362492bc9ddf.tar.gz
crawl-ref-4f8425fbbcbc232d6c009eaa391e362492bc9ddf.zip
Added a precautionary check for an empty delay queue (really shouldn't be
possible) during run. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1535 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 7f30600d45..70896b8f78 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -843,6 +843,7 @@ static void handle_run_delays(const delay_queue_item &delay)
}
if (you.running && !you.turn_is_over
+ && you_are_delayed()
&& !is_run_delay(current_delay_action()))
{
handle_delay();