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.

1 files changed, 2 insertions, 3 deletions

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index c36f50cd71..499abfa106 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1049,7 +1049,7 @@ static monster_type _xom_random_demon(int sever)
 static bool _player_is_dead(bool soon = true)
 {
     return you.hp <= 0
-        || is_feat_dangerous(grd(you.pos())) && !you.is_wall_clinging()
+        || is_feat_dangerous(grd(you.pos()))
         || you.did_escape_death()
         || soon && (you.strength() <= 0 || you.dex() <= 0 || you.intel() <= 0);
 }
@@ -2841,8 +2841,7 @@ static int _xom_player_confusion_effect(int sever, bool debug = false)
     {
         // Don't confuse the player if standing next to lava or deep water.
         for (adjacent_iterator ai(you.pos()); ai; ++ai)
-            if (in_bounds(*ai) && is_feat_dangerous(grd(*ai))
-                && !you.can_cling_to(*ai))
+            if (in_bounds(*ai) && is_feat_dangerous(grd(*ai)))
                 return XOM_DID_NOTHING;
     }