extern concptr describe_use(int i);
extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VALUE book_sval);
extern bool item_tester_okay(object_type *o_ptr, OBJECT_TYPE_VALUE tval);
-extern void display_inven(void);
-extern void display_equip(void);
+extern void display_inven(OBJECT_TYPE_VALUE tval);
+extern void display_equip(OBJECT_TYPE_VALUE tval);
extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);
extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);
extern void toggle_inven_equip(void);
* Choice window "shadow" of the "show_equip()" function
* @return なし
*/
-void display_equip(void)
+void display_equip(OBJECT_TYPE_VALUE tval)
{
register int i, n;
object_type *o_ptr;
{
o_ptr = &p_ptr->inventory_list[i];
tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
- if (select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr, item_tester_tval))
+ if (select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr, tval))
{
tmp_val[0] = index_to_label(i);
tmp_val[1] = ')';
n2 = I2A(i2);
/* Redraw if needed */
- if (command_see) get_item_label = show_inven(menu_line, mode, item_tester_tval);
+ if (command_see) get_item_label = show_inven(menu_line, mode, tval);
}
/* Equipment screen */
n2 = I2A(e2 - INVEN_RARM);
/* Redraw if needed */
- if (command_see) get_item_label = show_equip(menu_line, mode, item_tester_tval);
+ if (command_see) get_item_label = show_equip(menu_line, mode, tval);
}
/* Floor screen */
* Choice window "shadow" of the "show_inven()" function
* @return なし
*/
-void display_inven(void)
+void display_inven(OBJECT_TYPE_VALUE tval)
{
register int i, n, z = 0;
object_type *o_ptr;
{
o_ptr = &p_ptr->inventory_list[i];
tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
- if (item_tester_okay(o_ptr, item_tester_tval))
+ if (item_tester_okay(o_ptr, tval))
{
tmp_val[0] = index_to_label(i);
tmp_val[1] = ')';
Term_activate(angband_term[j]);
/* Display p_ptr->inventory_list */
- display_inven();
+ display_inven(item_tester_tval);
Term_fresh();
Term_activate(old);
}
Term_activate(angband_term[j]);
/* Display equipment */
- display_equip();
+ display_equip(item_tester_tval);
Term_fresh();
Term_activate(old);
}