diff options
| author | reaver <address.auto@gmail.com> | 2014-04-26 02:23:29 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-05-07 21:45:07 -0400 |
| commit | a3d40d3a14befa17830433262494841fb1bb274c (patch) | |
| tree | a331acb2c3698cbf804efefd3cf9805c540e2567 /crawl-ref/source/abyss.cc | |
| parent | 756ac6bdf381ed97f3a4d3f0f6ea9e6070d992eb (diff) | |
| download | crawl-ref-a3d40d3a14befa17830433262494841fb1bb274c.tar.gz crawl-ref-a3d40d3a14befa17830433262494841fb1bb274c.zip | |
Revert "Revert "Remove player clinging"."
This reverts commit 65ff1ef470978c29490100d1732bf2b9ce2fb7cd.
Conflicts:
crawl-ref/source/main.cc
crawl-ref/source/output.cc
crawl-ref/source/player.cc
crawl-ref/source/shout.cc
crawl-ref/source/status.cc
crawl-ref/source/status.h
crawl-ref/source/terrain.cc
crawl-ref/source/transform.cc
Minor, prerequesite reverts:
b0d520741c8e9a26e7a786a34285f7a9412d8d10
Trival removal of clinging from the Boots of the Spider
3e0928f93c3f8a78ac6327c26986b406f7d7f603
(conflict in crawl-ref/source/item_use.cc)
Thanks to gammafunk for removing the last bits of clinging code!
To do: Decide what to do about the boots of the spider.
Diffstat (limited to 'crawl-ref/source/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index d0623b2fdd..f7ae34c70b 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -1173,9 +1173,7 @@ static void _nuke_all_terrain(bool vaults) static void _ensure_player_habitable(bool dig_instead) { dungeon_feature_type feat = grd(you.pos()); - if (!you.can_pass_through_feat(feat) - || is_feat_dangerous(feat) && !(you.is_wall_clinging() - && cell_is_clingable(you.pos()))) + if (!you.can_pass_through_feat(feat) || is_feat_dangerous(feat)) { bool shoved = you.shove(); if (!shoved) |