Rework object list filters to avoid global variables

1 files changed, 9 insertions, 5 deletions

diff --git a/src/object1.hpp b/src/object1.hpp
index 01fc41d0..ba457619 100644
--- a/src/object1.hpp
+++ b/src/object1.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
 #include "angband.h"
+#include "object_filter.hpp"
+
+#include <boost/optional.hpp>
+#include <functional>
+
+typedef std::function<boost::optional<int>(object_filter_t const &filter)> select_by_name_t;
 
 extern byte get_item_letter_color(object_type *o_ptr);
 extern void object_pickup(int this_o_idx);
@@ -21,14 +27,12 @@ extern char index_to_label(int i);
 extern s16b wield_slot_ideal(object_type const *o_ptr, bool_ ideal);
 extern s16b wield_slot(object_type const *o_ptr);
 extern cptr describe_use(int i);
-extern bool_ item_tester_okay(object_type *o_ptr);
 extern void display_inven(void);
 extern void display_equip(void);
-extern void show_inven();
-extern void show_equip();
+extern void show_inven_full();
+extern void show_equip_full();
 extern void toggle_inven_equip(void);
-extern bool_ (*get_item_extra_hook)(int *cp);
-extern bool_ get_item(int *cp, cptr pmt, cptr str, int mode);
+extern bool_ get_item(int *cp, cptr pmt, cptr str, int mode, object_filter_t const &filter = object_filter::True(), select_by_name_t const &select_by_name = select_by_name_t());
 extern cptr item_activation(object_type *o_ptr,byte num);
 extern void py_pickup_floor(int pickup);
 extern void object_gain_level(object_type *o_ptr);