[Refactor] #37353 monster1～monster-hook間整理。 / Refactor between monster1 and monster...

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

diff --git a/src/externs.h b/src/externs.h
index 2182d46..e7e2586 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -258,10 +258,10 @@ extern u32b message__head;
 extern u32b message__tail;
 extern u32b *message__ptr;
 extern char *message__buf;
-extern u32b option_flag[8];
-extern u32b option_mask[8];
-extern u32b window_flag[8];
-extern u32b window_mask[8];
+extern BIT_FLAGS option_flag[8];
+extern BIT_FLAGS option_mask[8];
+extern BIT_FLAGS window_flag[8];
+extern BIT_FLAGS window_mask[8];
 extern term *angband_term[8];
 extern const char angband_term_name[8][16];
 extern byte angband_color_table[256][4];
@@ -385,7 +385,6 @@ extern MONRACE_IDX today_mon;
 extern bool write_level;
 extern u32b playtime;
 extern u32b start_time;
-extern int tsuri_dir;
 extern bool sukekaku;
 extern bool new_mane;
 extern bool mon_fight;
@@ -738,8 +737,6 @@ extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, u16b m
 extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, u16b 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);
 
 
@@ -761,7 +758,7 @@ extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode);
 extern int lore_do_probe(MONRACE_IDX r_idx);
 extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold);
 extern void sanity_blast(monster_type *m_ptr, bool necro);
-extern void update_mon(MONSTER_IDX m_idx, bool full);
+extern void update_monster(MONSTER_IDX m_idx, bool full);
 extern void update_monsters(bool full);
 extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode);
 extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode);
@@ -1056,19 +1053,6 @@ extern PERCENTAGE mod_spell_chance_2(PERCENTAGE chance);
 extern PERCENTAGE spell_chance(SPELL_IDX spell, REALM_IDX realm);
 extern bool spell_okay(int spell, bool learned, bool study_pray, int realm);
 extern void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX realm);
-extern bool hates_acid(object_type *o_ptr);
-extern bool hates_elec(object_type *o_ptr);
-extern bool hates_fire(object_type *o_ptr);
-extern bool hates_cold(object_type *o_ptr);
-extern int set_acid_destroy(object_type *o_ptr);
-extern int set_elec_destroy(object_type *o_ptr);
-extern int set_fire_destroy(object_type *o_ptr);
-extern int set_cold_destroy(object_type *o_ptr);
-extern int inven_damage(inven_func typ, int perc);
-extern int acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
 extern bool rustproof(void);
 extern bool curse_armor(void);
 extern bool curse_weapon_object(bool force, object_type *o_ptr);
@@ -1082,14 +1066,6 @@ extern void massacre(void);
 extern bool eat_lock(void);
 extern bool shock_power(void);
 
-/* store.c */
-extern bool combine_and_reorder_home(int store_num);
-extern void do_cmd_store(void);
-extern void store_shuffle(int which);
-extern void store_maint(int town_num, int store_num);
-extern void store_init(int town_num, int store_num);
-extern void move_to_black_market(object_type * o_ptr);
-
 /* bldg.c */
 extern bool get_nightmare(MONRACE_IDX r_idx);
 extern void battle_monsters(void);
@@ -1203,7 +1179,7 @@ extern void update_stuff(void);
 extern void redraw_stuff(void);
 extern void window_stuff(void);
 extern void handle_stuff(void);
-extern s16b empty_hands(bool riding_control);
+extern BIT_FLAGS16 empty_hands(bool riding_control);
 extern bool heavy_armor(void);
 extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines);
 extern void update_playtime(void);