• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision4837d2a841b4989848bfe633c8804593049419ff (tree)
Time2019-05-03 00:33:19
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- 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);
379379 extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option);
380380 PERCENTAGE breakage_chance(object_type *o_ptr, SPELL_IDX snipe_type);
381381
382-/* object2.c */
383-extern void excise_object_idx(OBJECT_IDX o_idx);
384-extern void delete_object_idx(OBJECT_IDX o_idx);
385-extern void delete_object(POSITION y, POSITION x);
386-extern void compact_objects(int size);
387-extern void wipe_o_list(void);
388-extern OBJECT_IDX o_pop(void);
389-extern OBJECT_IDX get_obj_num(DEPTH level);
390-extern void object_known(object_type *o_ptr);
391-extern void object_aware(object_type *o_ptr);
392-extern void object_tried(object_type *o_ptr);
393-extern byte value_check_aux1(object_type *o_ptr);
394-extern byte value_check_aux2(object_type *o_ptr);
395-extern PRICE object_value(object_type *o_ptr);
396-extern PRICE object_value_real(object_type *o_ptr);
397-extern void distribute_charges(object_type *o_ptr, object_type *q_ptr, int amt);
398-extern void reduce_charges(object_type *o_ptr, int amt);
399-extern int object_similar_part(object_type *o_ptr, object_type *j_ptr);
400-extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
401-extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
402-extern IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval);
403-extern void object_wipe(object_type *o_ptr);
404-extern void object_prep(object_type *o_ptr, KIND_OBJECT_IDX k_idx);
405-extern void object_copy(object_type *o_ptr, object_type *j_ptr);
406-extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
407-extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
408-extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode);
409-extern bool make_gold(object_type *j_ptr);
410-extern void place_gold(POSITION y, POSITION x);
411-extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x);
412-extern void inven_item_charges(INVENTORY_IDX item);
413-extern void inven_item_describe(INVENTORY_IDX item);
414-extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
415-extern void inven_item_optimize(INVENTORY_IDX item);
416-extern void floor_item_charges(INVENTORY_IDX item);
417-extern void floor_item_describe(INVENTORY_IDX item);
418-extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
419-extern void floor_item_optimize(INVENTORY_IDX item);
420-extern bool inven_carry_okay(object_type *o_ptr);
421-extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
422-extern s16b inven_carry(object_type *o_ptr);
423-extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt);
424-extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt);
425-extern void combine_pack(void);
426-extern void reorder_pack(void);
427-extern void display_koff(KIND_OBJECT_IDX k_idx);
428-extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs);
429-extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
430-extern void torch_lost_fuel(object_type *o_ptr);
431-extern concptr essence_name[];
432382
433383 /* racial.c */
434384 extern void do_cmd_racial_power(void);
--- a/src/object.h
+++ b/src/object.h
@@ -87,3 +87,53 @@ struct object_type
8787 };
8888
8989 extern int bow_tval_ammo(object_type *o_ptr);
90+/* object2.c */
91+extern void excise_object_idx(OBJECT_IDX o_idx);
92+extern void delete_object_idx(OBJECT_IDX o_idx);
93+extern void delete_object(POSITION y, POSITION x);
94+extern void compact_objects(int size);
95+extern void wipe_o_list(void);
96+extern OBJECT_IDX o_pop(void);
97+extern OBJECT_IDX get_obj_num(DEPTH level);
98+extern void object_known(object_type *o_ptr);
99+extern void object_aware(object_type *o_ptr);
100+extern void object_tried(object_type *o_ptr);
101+extern byte value_check_aux1(object_type *o_ptr);
102+extern byte value_check_aux2(object_type *o_ptr);
103+extern PRICE object_value(object_type *o_ptr);
104+extern PRICE object_value_real(object_type *o_ptr);
105+extern void distribute_charges(object_type *o_ptr, object_type *q_ptr, int amt);
106+extern void reduce_charges(object_type *o_ptr, int amt);
107+extern int object_similar_part(object_type *o_ptr, object_type *j_ptr);
108+extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
109+extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
110+extern IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval);
111+extern void object_wipe(object_type *o_ptr);
112+extern void object_prep(object_type *o_ptr, KIND_OBJECT_IDX k_idx);
113+extern void object_copy(object_type *o_ptr, object_type *j_ptr);
114+extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
115+extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
116+extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode);
117+extern bool make_gold(object_type *j_ptr);
118+extern void place_gold(POSITION y, POSITION x);
119+extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x);
120+extern void inven_item_charges(INVENTORY_IDX item);
121+extern void inven_item_describe(INVENTORY_IDX item);
122+extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
123+extern void inven_item_optimize(INVENTORY_IDX item);
124+extern void floor_item_charges(INVENTORY_IDX item);
125+extern void floor_item_describe(INVENTORY_IDX item);
126+extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);
127+extern void floor_item_optimize(INVENTORY_IDX item);
128+extern bool inven_carry_okay(object_type *o_ptr);
129+extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
130+extern s16b inven_carry(object_type *o_ptr);
131+extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt);
132+extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt);
133+extern void combine_pack(void);
134+extern void reorder_pack(void);
135+extern void display_koff(KIND_OBJECT_IDX k_idx);
136+extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs);
137+extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
138+extern void torch_lost_fuel(object_type *o_ptr);
139+extern concptr essence_name[];
\ No newline at end of file
Show on old repository browser