Flying can now be cancelled (though kenku still need a ring to do so.)

[2045628]
Removing rings of levitation or invisibility no longer cancels the
appropriate effects. [2076903]


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6951 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 1 insertions, 13 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 5ddf805d23..4dc17540b8 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -2201,7 +2201,7 @@ std::vector<talent> your_talents( bool check_confused )
         || scan_randarts( RAP_LEVITATE ))
     {
         // Has no effect on permanently flying Kenku.
-        if (!you.permanent_flight() && you.flight_mode() != FL_FLY)
+        if (!you.permanent_flight())
         {
             // Now you can only turn levitation off if you have an
             // activatable item.  Potions and miscast effects will
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index ac9f0c6e25..7451d7e9fe 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3232,18 +3232,6 @@ void jewellery_remove_effects(item_def &item, bool mesg)
         modify_stat(STAT_INTELLIGENCE, -item.plus, false, item, true);
         break;
 
-    case RING_INVISIBILITY:
-        // removing this ring effectively cancels all invisibility {dlb}
-        if (you.duration[DUR_INVIS])
-            you.duration[DUR_INVIS] = 1;
-        break;
-
-    case RING_LEVITATION:
-        // removing this ring effectively cancels all levitation {dlb}
-        if (you.duration[DUR_LEVITATION])
-            you.duration[DUR_LEVITATION] = 1;
-        break;
-
     case RING_MAGICAL_POWER:
         mpr("You feel your mana capacity decrease.");
         // dec_max_mp(9);