Refix food eating issue bug introduced by my previous fix of it.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index b47c332ffe..68f4ca08fd 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2386,7 +2386,9 @@ static bool _find_subtype_by_name(item_def &item,
     item.special   = 0;
     item.flags     = 0;
     item.quantity  = 1;
-    set_ident_flags( item, ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PROPERTIES );
+    // Don't use set_ident_flags in order to avoid triggering notes.
+    // FIXME - is this the proper solution?
+    item.flags |= (ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PROPERTIES);
 
     int type_wanted = -1;
 
@@ -2472,7 +2474,7 @@ bool item_is_equipped(const item_def &item)
         if (you.equip[i] == EQ_NONE)
             continue;
 
-        item_def& eq(you.inv[you.equip[i]]);
+        const item_def& eq(you.inv[you.equip[i]]);
 
         if (!is_valid_item(eq))
             continue;