[Refactor] #37353 object1.h の宣言を整理

diff --git a/src/externs.h b/src/externs.h
index 8793b40..3f5fbfc 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -355,31 +355,6 @@ extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
 extern SPEED get_mspeed(monster_race *r_ptr);
 extern void monster_drop_carried_objects(monster_type *m_ptr);
 
-/* object1.c */
-extern void reset_visuals(void);
-extern void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
-extern void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
-extern concptr item_activation(object_type *o_ptr);
-extern bool screen_object(object_type *o_ptr, BIT_FLAGS mode);
-extern char index_to_label(int i);
-extern INVENTORY_IDX label_to_inven(int c);
-extern INVENTORY_IDX label_to_equip(int c);
-extern s16b wield_slot(object_type *o_ptr);
-extern concptr mention_use(int i);
-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);
-extern void display_inven(void);
-extern void display_equip(void);
-extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode);
-extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode);
-extern void toggle_inven_equip(void);
-extern bool can_get_item(void);
-extern bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode);
-extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option);
-PERCENTAGE breakage_chance(object_type *o_ptr, SPELL_IDX snipe_type);
-
-
 /* racial.c */
 extern void do_cmd_racial_power(void);
 

diff --git a/src/object.h b/src/object.h
index 3817ab6..252262b 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -86,6 +86,30 @@ struct object_type
        ARTIFACT_BIAS_IDX artifact_bias; /*!< \83\89\83\93\83_\83\80\83A\81[\83e\83B\83t\83@\83N\83g\90¶\90¬\8e\9e\82Ì\83o\83C\83A\83XID */
 };
 
+/* object1.c */
+extern void reset_visuals(void);
+extern void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
+extern void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
+extern concptr item_activation(object_type *o_ptr);
+extern bool screen_object(object_type *o_ptr, BIT_FLAGS mode);
+extern char index_to_label(int i);
+extern INVENTORY_IDX label_to_inven(int c);
+extern INVENTORY_IDX label_to_equip(int c);
+extern s16b wield_slot(object_type *o_ptr);
+extern concptr mention_use(int i);
+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);
+extern void display_inven(void);
+extern void display_equip(void);
+extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode);
+extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode);
+extern void toggle_inven_equip(void);
+extern bool can_get_item(void);
+extern bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode);
+extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option);
+PERCENTAGE breakage_chance(object_type *o_ptr, SPELL_IDX snipe_type);
+
 extern int bow_tval_ammo(object_type *o_ptr);
 /* object2.c */
 extern void excise_object_idx(OBJECT_IDX o_idx);