• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisiondf3c12cb18e0132fe51a85b1d6c67747021438b2 (tree)
Time2019-05-03 01:44:32
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -333,28 +333,6 @@ extern void close_game(void);
333333 extern errr rd_savefile_new(void);
334334 extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
335335
336-/* monster2.c */
337-extern void set_target(monster_type *m_ptr, POSITION y, POSITION x);
338-extern void reset_target(monster_type *m_ptr);
339-extern monster_race *real_r_ptr(monster_type *m_ptr);
340-extern MONRACE_IDX real_r_idx(monster_type *m_ptr);
341-extern void delete_monster_idx(MONSTER_IDX i);
342-extern void delete_monster(POSITION y, POSITION x);
343-extern void compact_monsters(int size);
344-extern void wipe_m_list(void);
345-extern MONSTER_IDX m_pop(void);
346-extern errr get_mon_num_prep(monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2);
347-extern MONRACE_IDX get_mon_num(DEPTH level);
348-extern int lore_do_probe(MONRACE_IDX r_idx);
349-extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold);
350-extern void update_monster(MONSTER_IDX m_idx, bool full);
351-extern void update_monsters(bool full);
352-extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode);
353-extern void update_smart_learn(MONSTER_IDX m_idx, int what);
354-extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
355-extern SPEED get_mspeed(monster_race *r_ptr);
356-extern void monster_drop_carried_objects(monster_type *m_ptr);
357-
358336 /* racial.c */
359337 extern void do_cmd_racial_power(void);
360338
--- a/src/monster.h
+++ b/src/monster.h
@@ -425,6 +425,28 @@ extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
425425 extern int get_monster_crowd_number(MONSTER_IDX m_idx);
426426 extern void message_pain(MONSTER_IDX m_idx, HIT_POINT dam);
427427
428+/* monster2.c */
429+extern void set_target(monster_type *m_ptr, POSITION y, POSITION x);
430+extern void reset_target(monster_type *m_ptr);
431+extern monster_race *real_r_ptr(monster_type *m_ptr);
432+extern MONRACE_IDX real_r_idx(monster_type *m_ptr);
433+extern void delete_monster_idx(MONSTER_IDX i);
434+extern void delete_monster(POSITION y, POSITION x);
435+extern void compact_monsters(int size);
436+extern void wipe_m_list(void);
437+extern MONSTER_IDX m_pop(void);
438+extern errr get_mon_num_prep(monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2);
439+extern MONRACE_IDX get_mon_num(DEPTH level);
440+extern int lore_do_probe(MONRACE_IDX r_idx);
441+extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold);
442+extern void update_monster(MONSTER_IDX m_idx, bool full);
443+extern void update_monsters(bool full);
444+extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode);
445+extern void update_smart_learn(MONSTER_IDX m_idx, int what);
446+extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
447+extern SPEED get_mspeed(monster_race *r_ptr);
448+extern void monster_drop_carried_objects(monster_type *m_ptr);
449+
428450 #define is_friendly(A) \
429451 (bool)(((A)->smart & SM_FRIENDLY) ? TRUE : FALSE)
430452
--- a/src/object.h
+++ b/src/object.h
@@ -111,6 +111,7 @@ extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLA
111111 PERCENTAGE breakage_chance(object_type *o_ptr, SPELL_IDX snipe_type);
112112
113113 extern int bow_tval_ammo(object_type *o_ptr);
114+
114115 /* object2.c */
115116 extern void excise_object_idx(OBJECT_IDX o_idx);
116117 extern void delete_object_idx(OBJECT_IDX o_idx);
Show on old repository browser