[Refactor] #37353 item_tester_tval を object1.c/object.h へ移動．

diff --git a/src/externs.h b/src/externs.h
index f42d3e8..6f58eee 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -97,7 +97,6 @@ extern u32b saved_floor_file_sign;
 extern concptr keymap_act[KEYMAP_MODES][256];
 extern player_type *p_ptr;
 
-extern OBJECT_TYPE_VALUE item_tester_tval;
 extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
 extern int highscore_fd;

diff --git a/src/object.h b/src/object.h
index c7bb17b..6ef6f76 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -87,6 +87,7 @@ struct object_type
 };
 
 extern bool(*item_tester_hook)(object_type *o_ptr);
+extern OBJECT_TYPE_VALUE item_tester_tval;
 
 /* object1.c */
 extern ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode);

diff --git a/src/object1.c b/src/object1.c
index ae735de..bb79772 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1583,6 +1583,12 @@ bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VA
  */
 bool(*item_tester_hook)(object_type*);
 
+/*
+ * Here is a "pseudo-hook" used during calls to "get_item()" and
+ * "show_inven()" and "show_equip()", and the choice window routines.
+ */
+OBJECT_TYPE_VALUE item_tester_tval;
+
 /*!
  * @brief アイテムがitem_tester_hookグローバル関数ポインタの条件を満たしているかを返す汎用関数
  * Check an item against the item tester info

diff --git a/src/variable.c b/src/variable.c
index ddbe0c8..ea2d63a 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -129,13 +129,6 @@ player_type p_body;
  */
 player_type *p_ptr = &p_body;
 
-
-/*
- * Here is a "pseudo-hook" used during calls to "get_item()" and
- * "show_inven()" and "show_equip()", and the choice window routines.
- */
-OBJECT_TYPE_VALUE item_tester_tval;
-
 /*
  * Hack -- function hook to restrict "get_obj_num_prep()" function
  */