Fix levitation removal prevention logic.

Part of issue #2396.

For one, it's a lot simpler and more correct now, and takes into account the
updated uncancellable levitation logic.

Then, it no longer duplicates the scrambling-free-logic. This is really not
something the interface should know about, and if this is done, the check
should not be duplicated. Finally, it now asks the player instead of
outright denying. Aside from scrambling free, there are situations where you
might want to stop levitation anyway (e.g. scramblable lava with enough rF+
if the item has some other bad properties).

1 files changed, 1 insertions, 2 deletions

diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index 1e95637cb4..d5fa026856 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -49,8 +49,7 @@ void drink(int slot = -1);
 
 bool elemental_missile_beam(int launcher_brand, int ammo_brand);
 
-bool safe_to_remove_or_wear(const item_def &item, bool remove,
-                            bool quiet = false);
+bool safe_to_remove(const item_def &item, bool quiet = false);
 
 void examine_object(void);