[Refactor] #37353 mysqrt() を z-util.c へ移動。 / Move mysqrt() to z-util.c.

[hengband/hengband.git] / src / externs.h

diff --git a/src/externs.h b/src/externs.h
index f6f7afd..c9f8eb8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -339,8 +339,8 @@ extern OBJECT_TYPE_VALUE item_tester_tval;
 extern bool (*item_tester_hook)(object_type *o_ptr);
 extern bool (*ang_sort_comp)(vptr u, vptr v, int a, int b);
 extern void (*ang_sort_swap)(vptr u, vptr v, int a, int b);
-extern monster_hook_type get_mon_num_hook;
-extern monster_hook_type get_mon_num2_hook;
+extern monsterrace_hook_type get_mon_num_hook;
+extern monsterrace_hook_type get_mon_num2_hook;
 extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 extern bool monk_armour_aux;
 extern bool monk_notify_aux;
@@ -727,18 +727,16 @@ extern void display_roff(MONRACE_IDX r_idx);
 extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(byte attr, cptr str));
 extern void create_name(int type, char *name);
 
-extern monster_hook_type get_monster_hook(void);
-extern monster_hook_type get_monster_hook2(POSITION y, POSITION x);
+extern monsterrace_hook_type get_monster_hook(void);
+extern monsterrace_hook_type get_monster_hook2(POSITION y, POSITION x);
 extern void set_friendly(monster_type *m_ptr);
 extern void set_pet(monster_type *m_ptr);
 extern void set_hostile(monster_type *m_ptr);
 extern void anger_monster(monster_type *m_ptr);
-extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, u16b mode);
-extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, u16b mode);
+extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode);
+extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 mode);
 extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
 extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
-extern bool monster_living(monster_race *r_ptr);
-extern bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx);
 extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);
 
 
@@ -749,12 +747,13 @@ extern cptr funny_comments[MAX_SAN_COMMENT];
 extern void set_target(monster_type *m_ptr, POSITION y, POSITION x);
 extern void reset_target(monster_type *m_ptr);
 extern monster_race *real_r_ptr(monster_type *m_ptr);
+extern MONRACE_IDX real_r_idx(monster_type *m_ptr);
 extern void delete_monster_idx(MONSTER_IDX i);
 extern void delete_monster(POSITION y, POSITION x);
 extern void compact_monsters(int size);
 extern void wipe_m_list(void);
 extern MONSTER_IDX m_pop(void);
-extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2);
+extern errr get_mon_num_prep(monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2);
 extern MONRACE_IDX get_mon_num(DEPTH level);
 extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode);
 extern int lore_do_probe(MONRACE_IDX r_idx);
@@ -1263,7 +1262,7 @@ extern void check_experience(void);
 extern void complete_quest(QUEST_IDX quest_num);
 extern void check_quest_completion(monster_type *m_ptr);
 extern void check_find_art_quest_completion(object_type *o_ptr);
-extern cptr extract_note_dies(monster_race *r_ptr);
+extern cptr extract_note_dies(MONRACE_IDX r_idx);
 extern void monster_death(MONSTER_IDX m_idx, bool drop_item);
 extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note);
 extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);