diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 03:51:15 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 03:51:15 +0000 |
| commit | f7f652ac0f4c5a193ee4ad5471a85cf723466e24 (patch) | |
| tree | 3b054e9b88141bba7bd6a7a8d9c3946c8e66b7b4 /crawl-ref/source/delay.cc | |
| parent | 14752e5f2cfddc5b99a104afe1c8d42a74aff22b (diff) | |
| download | crawl-ref-f7f652ac0f4c5a193ee4ad5471a85cf723466e24.tar.gz crawl-ref-f7f652ac0f4c5a193ee4ad5471a85cf723466e24.zip | |
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
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 8 |
1 files changed, 8 insertions, 0 deletions
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]); } |