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

diff --git a/src/externs.h b/src/externs.h
index 3cf1961..8793b40 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -379,56 +379,6 @@ 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);
 
-/* object2.c */
-extern void excise_object_idx(OBJECT_IDX o_idx);
-extern void delete_object_idx(OBJECT_IDX o_idx);
-extern void delete_object(POSITION y, POSITION x);
-extern void compact_objects(int size);
-extern void wipe_o_list(void);
-extern OBJECT_IDX o_pop(void);
-extern OBJECT_IDX get_obj_num(DEPTH level);
-extern void object_known(object_type *o_ptr);
-extern void object_aware(object_type *o_ptr);
-extern void object_tried(object_type *o_ptr);
-extern byte value_check_aux1(object_type *o_ptr);
-extern byte value_check_aux2(object_type *o_ptr);
-extern PRICE object_value(object_type *o_ptr);
-extern PRICE object_value_real(object_type *o_ptr);
-extern void distribute_charges(object_type *o_ptr, object_type *q_ptr, int amt);
-extern void reduce_charges(object_type *o_ptr, int amt);
-extern int object_similar_part(object_type *o_ptr, object_type *j_ptr);
-extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
-extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
-extern IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval);
-extern void object_wipe(object_type *o_ptr);
-extern void object_prep(object_type *o_ptr, KIND_OBJECT_IDX k_idx);
-extern void object_copy(object_type *o_ptr, object_type *j_ptr);
-extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
-extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
-extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode);
-extern bool make_gold(object_type *j_ptr);
-extern void place_gold(POSITION y, POSITION x);
-extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x);
-extern void inven_item_charges(INVENTORY_IDX item);
-extern void inven_item_describe(INVENTORY_IDX item);
-extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
-extern void inven_item_optimize(INVENTORY_IDX item);
-extern void floor_item_charges(INVENTORY_IDX item);
-extern void floor_item_describe(INVENTORY_IDX item);
-extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
-extern void floor_item_optimize(INVENTORY_IDX item);
-extern bool inven_carry_okay(object_type *o_ptr);
-extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
-extern s16b inven_carry(object_type *o_ptr);
-extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt);
-extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt);
-extern void combine_pack(void);
-extern void reorder_pack(void);
-extern void display_koff(KIND_OBJECT_IDX k_idx);
-extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs);
-extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
-extern void torch_lost_fuel(object_type *o_ptr);
-extern concptr essence_name[];
 
 /* racial.c */
 extern void do_cmd_racial_power(void);

diff --git a/src/object.h b/src/object.h
index fd0c3b6..5dc8df1 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -87,3 +87,53 @@ struct object_type
 };
 
 extern int bow_tval_ammo(object_type *o_ptr);
+/* object2.c */
+extern void excise_object_idx(OBJECT_IDX o_idx);
+extern void delete_object_idx(OBJECT_IDX o_idx);
+extern void delete_object(POSITION y, POSITION x);
+extern void compact_objects(int size);
+extern void wipe_o_list(void);
+extern OBJECT_IDX o_pop(void);
+extern OBJECT_IDX get_obj_num(DEPTH level);
+extern void object_known(object_type *o_ptr);
+extern void object_aware(object_type *o_ptr);
+extern void object_tried(object_type *o_ptr);
+extern byte value_check_aux1(object_type *o_ptr);
+extern byte value_check_aux2(object_type *o_ptr);
+extern PRICE object_value(object_type *o_ptr);
+extern PRICE object_value_real(object_type *o_ptr);
+extern void distribute_charges(object_type *o_ptr, object_type *q_ptr, int amt);
+extern void reduce_charges(object_type *o_ptr, int amt);
+extern int object_similar_part(object_type *o_ptr, object_type *j_ptr);
+extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
+extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
+extern IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval);
+extern void object_wipe(object_type *o_ptr);
+extern void object_prep(object_type *o_ptr, KIND_OBJECT_IDX k_idx);
+extern void object_copy(object_type *o_ptr, object_type *j_ptr);
+extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
+extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
+extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode);
+extern bool make_gold(object_type *j_ptr);
+extern void place_gold(POSITION y, POSITION x);
+extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x);
+extern void inven_item_charges(INVENTORY_IDX item);
+extern void inven_item_describe(INVENTORY_IDX item);
+extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
+extern void inven_item_optimize(INVENTORY_IDX item);
+extern void floor_item_charges(INVENTORY_IDX item);
+extern void floor_item_describe(INVENTORY_IDX item);
+extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
+extern void floor_item_optimize(INVENTORY_IDX item);
+extern bool inven_carry_okay(object_type *o_ptr);
+extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
+extern s16b inven_carry(object_type *o_ptr);
+extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt);
+extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt);
+extern void combine_pack(void);
+extern void reorder_pack(void);
+extern void display_koff(KIND_OBJECT_IDX k_idx);
+extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs);
+extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
+extern void torch_lost_fuel(object_type *o_ptr);
+extern concptr essence_name[];
\ No newline at end of file