summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/stairs.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-03-11 16:46:59 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2014-03-11 16:53:31 -0600
commit63f152f1fce206446bb886867570b3eb93dd6af2 (patch)
treeac3c40092e83d56d9d8acabb669880328aacc29c /crawl-ref/source/stairs.cc
parent83c5e769d0f02cc25f5a322a9f3a3e965837f661 (diff)
downloadcrawl-ref-63f152f1fce206446bb886867570b3eb93dd6af2.tar.gz
crawl-ref-63f152f1fce206446bb886867570b3eb93dd6af2.zip
Allow players to continue traversing stairs if they get sealed halfway.
This was never intentional, by all indications.
Diffstat (limited to 'crawl-ref/source/stairs.cc')
-rw-r--r--crawl-ref/source/stairs.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/stairs.cc b/crawl-ref/source/stairs.cc
index 89f79f89e8..7073141d43 100644
--- a/crawl-ref/source/stairs.cc
+++ b/crawl-ref/source/stairs.cc
@@ -337,7 +337,7 @@ static bool _check_stairs(const dungeon_feature_type ftype, bool down = false)
void up_stairs(dungeon_feature_type force_stair)
{
dungeon_feature_type stair_find = (force_stair ? force_stair
- : grd(you.pos()));
+ : orig_terrain(you.pos()));
const level_id old_level = level_id::current();
// Up and down both work for portals.
@@ -482,7 +482,7 @@ void up_stairs(dungeon_feature_type force_stair)
// than merely asking what is on the other side.
level_id stair_destination(coord_def pos, bool for_real)
{
- return stair_destination(grd(pos),
+ return stair_destination(orig_terrain(pos),
env.markers.property_at(pos, MAT_ANY, "dst"),
for_real);
}
@@ -645,7 +645,7 @@ static void _maybe_destroy_trap(const coord_def &p)
void down_stairs(dungeon_feature_type force_stair, bool force_known_shaft)
{
const level_id old_level = level_id::current();
- const dungeon_feature_type old_feat = grd(you.pos());
+ const dungeon_feature_type old_feat = orig_terrain(you.pos());
const dungeon_feature_type stair_find =
force_stair ? force_stair : old_feat;