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/transform.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/transform.cc')
| -rw-r--r-- | crawl-ref/source/transform.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index 95eefed2f3..01a9e4f503 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -609,10 +609,6 @@ bool feat_dangerous_for_form(transformation_type which_trans, if (form_can_fly(which_trans) || _flying_in_new_form(which_trans)) return false; - // We can only cling for safety if we're already doing so. - if (which_trans == TRAN_SPIDER && you.is_wall_clinging()) - return false; - if (feat == DNGN_LAVA) return !form_likes_lava(which_trans); @@ -1186,7 +1182,6 @@ bool transform(int pow, transformation_type which_trans, bool involuntary, you.stop_being_constricted(); } - you.check_clinging(false); // If we are no longer living, end an effect that afflicts only the living if (you.duration[DUR_FLAYED] && you.holiness() != MH_NATURAL) @@ -1263,8 +1258,6 @@ void untransform(bool skip_wielding, bool skip_move) mprf(MSGCH_DURATION, "Your transformation has ended."); notify_stat_change(STAT_DEX, -5, true, "losing the spider transformation"); - if (!skip_move) - you.check_clinging(false); break; case TRAN_BAT: |