From f7f652ac0f4c5a193ee4ad5471a85cf723466e24 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Mon, 26 May 2008 03:51:15 +0000 Subject: Fix 1971173: don't interrupt interlevel travel for monsters coming into view if you're already going up or down stairs. Also, only interrupt for HP or MP being fully restored when resting. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5250 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/delay.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'crawl-ref/source/delay.cc') diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 2bfccaaab6..991d6cef20 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1534,6 +1534,14 @@ static bool should_stop_activity(const delay_queue_item &item, if (userd) return (userd == 1); + delay_type curr = current_delay_action(); + + if (curr != DELAY_REST && (ai == AI_FULL_HP || ai == AI_FULL_MP)) + return false; + else if (ai == AI_SEE_MONSTER && (curr == DELAY_ASCENDING_STAIRS || + curr == DELAY_DESCENDING_STAIRS)) + return false; + return (ai == AI_FORCE_INTERRUPT || Options.activity_interrupts[item.type][ai]); } -- cgit v1.2.3-54-g00ecf