summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 22:35:28 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 22:35:28 +0000
commite9fd95f6c3dccee78f770c32757da8cd0f938011 (patch)
treed8db42feea3b77f5e4d3c46a85bab0d2c13a8201 /crawl-ref/source/delay.cc
parentbf2a59fd761571998062b21409ee678e2852254b (diff)
downloadcrawl-ref-e9fd95f6c3dccee78f770c32757da8cd0f938011.tar.gz
crawl-ref-e9fd95f6c3dccee78f770c32757da8cd0f938011.zip
Add ASSERT(!crawl_state.arena) to a number of places.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8184 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index e04b3c7762..0f8c5ed9e8 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -296,6 +296,7 @@ static void _clear_pending_delays()
void start_delay( delay_type type, int turns, int parm1, int parm2 )
{
+ ASSERT(!crawl_state.arena);
ASSERT(!crawl_state.is_repeating_cmd() || type == DELAY_MACRO);
_interrupts_blocked = 0; // Just to be safe
@@ -331,6 +332,8 @@ void stop_delay( bool stop_stair_travel )
if (you.delay_queue.empty())
return;
+ ASSERT(!crawl_state.arena);
+
delay_queue_item delay = you.delay_queue.front();
ASSERT(!crawl_state.is_repeating_cmd() || delay.type == DELAY_MACRO);