From 17f838f7c01be467c6d64e45f71665283326ff2e Mon Sep 17 00:00:00 2001
From: Nicholas Feinberg <pleasingfung@gmail.com>
Date: Sat, 5 Apr 2014 21:04:27 -0700
Subject: [PATCH] Make lava (& deep water) lethal

---
 crawl-ref/source/item_use.cc     | 13 ++++---------
 crawl-ref/source/player-equip.cc |  6 +++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index d825ad3..b74e391 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1188,17 +1188,12 @@ bool safe_to_remove(const item_def &item, bool quiet)
     const dungeon_feature_type feat = grd(you.pos());
 
     if (grants_flight && removing_ends_flight
-        && (feat == DNGN_LAVA
+        && (feat == DNGN_LAVA && !player_likes_lava()
             || feat == DNGN_DEEP_WATER && !player_likes_water()))
     {
-        if (quiet)
-            return false;
-        else
-        {
-            string fname = (feat == DNGN_LAVA ? "lava" : "deep water");
-            string prompt = "Really remove this item over " + fname + "?";
-            return yesno(prompt.c_str(), false, 'n');
-        }
+        if (!quiet)
+            mpr("Losing flight right now would be fatal!");
+        return false;
     }
 
     return true;
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index ca3c3de..646fa27 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -1131,10 +1131,10 @@ static void _unequip_armour_effect(item_def& item, bool meld)
         // since a permflight item can keep tempflight evocations going
         // we should check tempflight here too
         if (you.cancellable_flight() && !you.evokable_flight())
-        {
             you.duration[DUR_FLIGHT] = 0;
-            land_player();
-        }
+
+        land_player(); //land_player() has a check for airborne()
+
         break;
 
     case SPARM_JUMPING:
-- 
1.8.5.2 (Apple Git-48)