Apply more commits into 0.4 branch, again mostly by Haran:

6950, 6954, 6959, 6962, 6963, 6965, 6968, 6970 (partly), 6997, 6998, 
7001, 7061, 7065, 7071, 7132 (partly), 7174, 7186, 7213, 7233, 7268,
7268, 7293, 7319, 7339, 7358, 7393 (partly)

* Tweak a few monster flags.
* Fix autoswapping jewellery taking longer than manual swapping.
* Fix crash when attempting to create nonexisting monster in wizmode.
* Make ego armour descriptions follow abbreviation guidelines.
* Fixed buggy monster movement away from the player.
* Disabled traps in the Abyss.
* Fixed a few other minor bugs, and improves messaging.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7788 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 12 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index eed2f0be2d..b7ccb19185 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2478,24 +2478,17 @@ item_def find_item_type(object_class_type base_type, std::string name)
     return (item);
 }
 
-bool item_is_equipped(const item_def &item)
+bool item_is_equipped(const item_def &item, bool quiver_too)
 {
     if (item.x != -1 || item.y != -1)
         return (false);
 
     for (int i = 0; i < NUM_EQUIP; i++)
-    {
-        if (you.equip[i] == EQ_NONE)
-            continue;
-
-        const item_def& eq(you.inv[you.equip[i]]);
-
-        if (!is_valid_item(eq))
-            continue;
-
-        if (&eq == &item)
+        if (item.link == you.equip[i])
             return (true);
-    }
+
+    if (quiver_too && item.link == you.m_quiver->get_fire_item(NULL))
+        return (true);
 
     return (false);
 }