summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/stairs.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-03-27 05:18:26 +0000
committerChris Campbell <chriscampbell89@gmail.com>2014-03-27 06:25:10 +0000
commit3f120941245bd53aaa032cfc731b433473841f2d (patch)
tree1a75251d23f342de4191e6ca5ebeb25ef93caee4 /crawl-ref/source/stairs.cc
parentc7125568250a0247176c5265f8ef27d40e77293f (diff)
downloadcrawl-ref-3f120941245bd53aaa032cfc731b433473841f2d.tar.gz
crawl-ref-3f120941245bd53aaa032cfc731b433473841f2d.zip
Don't allow tripping when being cast deeper into the Abyss (#6975)
Or when Xom reverts your banishment.
Diffstat (limited to 'crawl-ref/source/stairs.cc')
-rw-r--r--crawl-ref/source/stairs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/stairs.cc b/crawl-ref/source/stairs.cc
index 7073141d43..0f97e149d7 100644
--- a/crawl-ref/source/stairs.cc
+++ b/crawl-ref/source/stairs.cc
@@ -916,6 +916,8 @@ void down_stairs(dungeon_feature_type force_stair, bool force_known_shaft)
&& you.confused()
&& !feat_is_escape_hatch(stair_find)
&& force_stair != DNGN_ENTER_ABYSS
+ && force_stair != DNGN_ABYSSAL_STAIR
+ && force_stair != DNGN_EXIT_ABYSS
&& coinflip())
{
const char* fall_where = "down the stairs";