summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-30 15:13:02 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-30 15:13:02 +0000
commit464e945f78e101802a8784636afa07a45c3b38b9 (patch)
tree1b3504874a911d034b2029a7d9e656bb709da5c4 /crawl-ref/source/initfile.cc
parentf984dabc74b0a6370e91147b6709b3ca6e591448 (diff)
downloadcrawl-ref-464e945f78e101802a8784636afa07a45c3b38b9.tar.gz
crawl-ref-464e945f78e101802a8784636afa07a45c3b38b9.zip
Fix [2478469]: teleport should stop stair use delays.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8854 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f036bacb06..35ff9d6c22 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -539,10 +539,11 @@ void game_options::set_default_activity_interrupts()
"interrupt_run = interrupt_travel, message",
"interrupt_rest = interrupt_run, full_hp, full_mp",
- // Stair ascents/descents cannot be interrupted, attempts to interrupt
- // the delay will just trash all queued delays, including travel.
- "interrupt_ascending_stairs =",
- "interrupt_descending_stairs =",
+ // Stair ascents/descents cannot be interrupted except by
+ // teleportation. Attempts to interrupt the delay will just
+ // trash all queued delays, including travel.
+ "interrupt_ascending_stairs = teleport",
+ "interrupt_descending_stairs = teleport",
"interrupt_recite = teleport",
"interrupt_uninterruptible =",
"interrupt_weapon_swap =",