Remove pickup.lua.

Make menu_colour_item_prefix also apply for autopickup_exceptions, so
you can exclude, for example, all evil_eating at once.
Fix Vampires "continuing draining" after having "stopped".


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

1 files changed, 4 insertions, 7 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index e03d56722e..e40aa46e59 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2190,7 +2190,8 @@ void autoinscribe()
 static inline std::string _autopickup_item_name(const item_def &item)
 {
     return userdef_annotate_item(STASH_LUA_SEARCH_ANNOTATE, &item, true)
-        + item.name(DESC_PLAIN);
+           + menu_colour_item_prefix(item, false)
+           + item.name(DESC_PLAIN);
 }
 
 static bool _is_denied_autopickup(const item_def &item, std::string &iname)
@@ -2230,12 +2231,8 @@ bool item_needs_autopickup(const item_def &item)
 
     std::string itemname;
     return ((Options.autopickups & (1L << item.base_type)
-                && !is_useless_item(item) && !is_inedible(item)
-                && !is_dangerous_item(item)
-#ifdef CLUA_BINDINGS
-                && clua.callbooleanfn(true, "ch_autopickup", "u", &item)
-#endif
-              || _is_forced_autopickup(item, itemname))
+                    && !is_useless_item(item) && !is_inedible(item)
+                || _is_forced_autopickup(item, itemname))
             && (Options.pickup_dropped || !(item.flags & ISFLAG_DROPPED))
             && !_is_denied_autopickup(item, itemname));
 }