Remove dead declarations/code

Tidy up scan_floor a little to avoid unused cases and parameters.

4 files changed, 33 insertions, 114 deletions

diff --git a/src/dungeon.cc b/src/dungeon.cc
index dd4142c0..efee209d 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -802,7 +802,7 @@ static void regen_monsters(void)
  *
  * Should belong to object1.c, renamed to object_decays() -- pelpel
  */
-bool_ decays(object_type *o_ptr)
+static bool_ decays(object_type *o_ptr)
 {
 	u32b f1, f2, f3, f4, f5, esp;
 
diff --git a/src/externs.h b/src/externs.h
index 7df3ec28..037d68e3 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -549,8 +549,6 @@ extern errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int
 
 /* init2.c */
 extern void init_corruptions();
-extern void reinit_gods(s16b new_size);
-extern void reinit_quests(s16b new_size);
 extern void create_stores_stock(int t);
 extern errr init_v_info(void);
 extern void init_file_paths(char *path);
@@ -684,11 +682,8 @@ extern s32b calc_total_weight(void);
 extern void add_random_ego_flag(object_type *o_ptr, int fego, bool_ *limit_blows);
 extern bool_ info_spell;
 extern char spell_txt[50];
-extern bool_ grab_tval_desc(int tval);
 extern void init_match_theme(obj_theme theme);
 extern bool_ kind_is_artifactable(int k_idx);
-extern bool_ kind_is_good(int k_idx);
-extern int kind_is_legal_special;
 extern bool_ kind_is_legal(int k_idx);
 extern bool_ verify(cptr prompt, int item);
 extern void flavor_init(void);
@@ -701,11 +696,8 @@ extern void object_desc(char *buf, object_type *o_ptr, int pref, int mode);
 extern void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode);
 extern bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait_for_it);
 extern char index_to_label(int i);
-extern s16b label_to_inven(int c);
-extern s16b label_to_equip(int c);
 extern s16b wield_slot_ideal(object_type *o_ptr, bool_ ideal);
 extern s16b wield_slot(object_type *o_ptr);
-extern cptr mention_use(int i);
 extern cptr describe_use(int i);
 extern void inven_item_charges(int item);
 extern void inven_item_describe(int item);
@@ -759,20 +751,14 @@ extern void pick_trap(int y, int x);
 extern cptr item_activation(object_type *o_ptr,byte num);
 extern void combine_pack(void);
 extern void reorder_pack(void);
-extern void display_koff(int k_idx);
 extern void random_artifact_resistance (object_type * o_ptr);
 extern void random_resistance (object_type * o_ptr, bool_ is_scroll, int specific);
 extern s16b floor_carry(int y, int x, object_type *j_ptr);
 extern void pack_decay(int item);
 extern void floor_decay(int item);
-extern bool_ scan_floor(int *items, int *item_num, int y, int x, int mode);
-extern void show_floor(int y, int x);
-extern bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode);
 extern void py_pickup_floor(int pickup);
 extern s16b m_bonus(int max, int level);
 extern void object_gain_level(object_type *o_ptr);
-extern void gain_flag_group_flag(object_type *o_ptr, bool_ silent);
-extern void gain_flag_group(object_type *o_ptr, bool_ silent);
 extern s32b flag_cost(object_type * o_ptr, int plusses);
 
 /* powers.c */
diff --git a/src/object1.cc b/src/object1.cc
index b5b25c59..5e62519d 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -2502,7 +2502,7 @@ cptr item_activation(object_type *o_ptr, byte num)
 }
 
 /* Grab the tval desc */
-bool_ grab_tval_desc(int tval)
+static bool_ grab_tval_desc(int tval)
 {
 	int tv = 0;
 
@@ -3841,7 +3841,7 @@ char index_to_label(int i)
  * Convert a label into the index of an item in the "inven"
  * Return "-1" if the label does not indicate a real item
  */
-s16b label_to_inven(int c)
+static s16b label_to_inven(int c)
 {
 	int i;
 
@@ -3863,7 +3863,7 @@ s16b label_to_inven(int c)
  * Convert a label into the index of a item in the "equip"
  * Return "-1" if the label does not indicate a real item
  */
-s16b label_to_equip(int c)
+static s16b label_to_equip(int c)
 {
 	int i;
 
@@ -4108,7 +4108,7 @@ s16b wield_slot(object_type *o_ptr)
 /*
  * Return a string mentioning how a given item is carried
  */
-cptr mention_use(int i)
+static cptr mention_use(int i)
 {
 	cptr p;
 
@@ -4974,61 +4974,46 @@ static int get_tag(int *cp, char tag)
  * scan_floor --
  *
  * Return a list of o_list[] indexes of items at the given cave
- * location. Valid flags are:
- *
- *            mode & 0x01 -- Item tester
- *            mode & 0x02 -- Marked items only
- *            mode & 0x04 -- Stop after first
+ * location.
  */
-bool_ scan_floor(int *items, int *item_num, int y, int x, int mode)
+static std::vector<int> scan_floor(int y, int x)
 {
 	int this_o_idx, next_o_idx;
-
-	int num = 0;
-
-	(*item_num) = 0;
+	std::vector<int> items;
 
 	/* Sanity */
-	if (!in_bounds(y, x)) return (FALSE);
+	if (!in_bounds(y, x))
+	{
+		return items;
+	}
 
 	/* Scan all objects in the grid */
 	for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
 	{
-		object_type * o_ptr;
-
 		/* Acquire object */
-		o_ptr = &o_list[this_o_idx];
+		object_type * o_ptr = &o_list[this_o_idx];
 
 		/* Acquire next object */
 		next_o_idx = o_ptr->next_o_idx;
 
 		/* Item tester */
-		if ((mode & 0x01) && !item_tester_okay(o_ptr)) continue;
-
-		/* Marked */
-		if ((mode & 0x02) && !o_ptr->marked) continue;
+		if (!item_tester_okay(o_ptr)) continue;
 
 		/* Accept this item */
-		items[num++] = this_o_idx;
-
-		/* Only one */
-		if (mode & 0x04) break;
+		items.push_back(this_o_idx);
 
 		/* XXX Hack -- Enforce limit */
-		if (num == 23) break;
+		if (items.size() == 23) break;
 	}
 
-	/* Number of items */
-	(*item_num) = num;
-
 	/* Result */
-	return (num != 0);
+	return items;
 }
 
 /*
  * Display a list of the items on the floor at the given location.
  */
-void show_floor(int y, int x)
+static void show_floor(int y, int x)
 {
 	int i, j, k, l;
 	int col, len, lim;
@@ -5043,8 +5028,6 @@ void show_floor(int y, int x)
 	byte out_color[23];
 	char out_desc[23][80];
 
-	int floor_list[23], floor_num;
-
 	/* Default length */
 	len = 79 - 50;
 
@@ -5055,7 +5038,9 @@ void show_floor(int y, int x)
 	lim -= 9;
 
 	/* Scan for objects in the grid, using item_tester_okay() */
-	(void) scan_floor(floor_list, &floor_num, y, x, 0x01);
+	auto const floor_list = scan_floor(y, x);
+	assert(floor_list.size() <= 23);
+	int const floor_num = floor_list.size(); // "int" for warning avoidance
 
 	/* Display the inventory */
 	for (k = 0, i = 0; i < floor_num; i++)
@@ -5131,7 +5116,7 @@ void show_floor(int y, int x)
  * the easy_floor is on.
  */
 bool_ (*get_item_extra_hook)(int *cp);
-bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
+static bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 {
 	char n1 = 0, n2 = 0, which = ' ';
 
@@ -5156,7 +5141,7 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	char tmp_val[160];
 	char out_val[160];
 
-	int floor_num, floor_list[23], floor_top = 0;
+	int floor_top = 0;
 
 	k = 0;
 
@@ -5246,15 +5231,12 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	while ((e1 <= e2) && (!get_item_okay(e2))) e2--;
 
 
-	/* Count "okay" floor items */
-	floor_num = 0;
-
-	/* Restrict floor usage */
-	if (floor)
-	{
-		/* Scan all objects in the grid */
-		(void) scan_floor(floor_list, &floor_num, p_ptr->py, p_ptr->px, 0x01);
-	}
+	/* Floor items? */
+	auto const floor_list =
+		floor ? std::move(scan_floor(p_ptr->py, p_ptr->px))
+		      : std::vector<int>();
+	assert(floor_list.size() <= 23);
+	int const floor_num = floor_list.size(); // "int" for warning avoidance
 
 	/* Accept inventory */
 	if (i1 <= i2) allow_inven = TRUE;
@@ -5263,7 +5245,7 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	if (e1 <= e2) allow_equip = TRUE;
 
 	/* Accept floor */
-	if (floor_num) allow_floor = TRUE;
+	if (!floor_list.empty()) allow_floor = TRUE;
 
 	/* Require at least one legal choice */
 	if (!allow_inven && !allow_equip && !allow_floor)
@@ -6307,7 +6289,7 @@ void py_pickup_floor(int pickup)
 }
 
 /* Add a flags group */
-void gain_flag_group(object_type *o_ptr, bool_ silent)
+static void gain_flag_group(object_type *o_ptr, bool_ silent)
 {
 	int grp = 0;
 	int tries = 1000;
@@ -6402,7 +6384,7 @@ u32b get_flag(object_type *o_ptr, int grp, int k)
 }
 
 /* Add a flags from a flag group */
-void gain_flag_group_flag(object_type *o_ptr, bool_ silent)
+static void gain_flag_group_flag(object_type *o_ptr, bool_ silent)
 {
 	int grp = 0, k = 0;
 	u32b f = 0;
diff --git a/src/object2.cc b/src/object2.cc
index 5b467086..3055ad51 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -4592,7 +4592,6 @@ bool_ kind_is_theme(int k_idx)
 /*
  * Determine if an object must not be generated.
  */
-int kind_is_legal_special = -1;
 bool_ kind_is_legal(int k_idx)
 {
 	object_kind *k_ptr = &k_info[k_idx];
@@ -4629,9 +4628,6 @@ bool_ kind_is_legal(int k_idx)
 	/* Used only for the Nazgul rings */
 	if ((k_ptr->tval == TV_RING) && (k_ptr->sval == SV_RING_SPECIAL)) return FALSE;
 
-	/* Are we forced to one tval ? */
-	if ((kind_is_legal_special != -1) && (kind_is_legal_special != k_ptr->tval)) return (FALSE);
-
 	/* Assume legal */
 	return TRUE;
 }
@@ -4640,7 +4636,7 @@ bool_ kind_is_legal(int k_idx)
 /*
  * Hack -- determine if a template is "good"
  */
-bool_ kind_is_good(int k_idx)
+static bool_ kind_is_good(int k_idx)
 {
 	object_kind *k_ptr = &k_info[k_idx];
 
@@ -6329,51 +6325,6 @@ void reorder_pack(void)
 	if (flag) msg_print("You reorder some items in your pack.");
 }
 
-/*
- * Hack -- display an object kind in the current window
- *
- * Include list of usable spells for readible books
- */
-void display_koff(int k_idx)
-{
-	int y;
-
-	object_type forge;
-	object_type *q_ptr;
-
-	char o_name[80];
-
-
-	/* Erase the window */
-	int hgt;
-	Term_get_size(nullptr, &hgt);
-	for (y = 0; y < hgt; y++)
-	{
-		/* Erase the line */
-		Term_erase(0, y, 255);
-	}
-
-	/* No info */
-	if (!k_idx) return;
-
-
-	/* Get local object */
-	q_ptr = &forge;
-
-	/* Prepare the object */
-	object_wipe(q_ptr);
-
-	/* Prepare the object */
-	object_prep(q_ptr, k_idx);
-
-
-	/* Describe */
-	object_desc_store(o_name, q_ptr, FALSE, 0);
-
-	/* Mention the object name */
-	Term_putstr(0, 0, -1, TERM_WHITE, o_name);
-}
-
 
 /*
  * Let the floor carry an object