#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

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

diff --git a/src/externs.h b/src/externs.h
index 7337d0b..4256249 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -516,7 +516,7 @@ 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 bool (*get_obj_num_hook)(int k_idx);
+extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 extern bool monk_armour_aux;
 extern bool monk_notify_aux;
 extern wilderness_type **wilderness;
@@ -796,7 +796,7 @@ extern cptr spell_category_name(OBJECT_TYPE_VALUE tval);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void do_cmd_cast(void);
-extern bool rakuba(int dam, bool force);
+extern bool rakuba(HIT_POINT dam, bool force);
 extern bool do_riding(bool force);
 extern void check_pets_num_and_align(monster_type *m_ptr, bool inc);
 extern int calculate_upkeep(void);
@@ -1091,18 +1091,18 @@ extern bool save_floor(saved_floor_type *sf_ptr, u32b mode);
 
 /* spells1.c */
 extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ);
+extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ);
 extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
 extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ);
 extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg);
 extern int dist_to_line(int y, int x, int y1, int x1, int y2, int x2);
-extern bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell);
+extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell);
 extern int project_length;
-extern bool binding_field(int dam);
-extern void seal_of_mirror(int dam);
+extern bool binding_field(HIT_POINT dam);
+extern void seal_of_mirror(HIT_POINT dam);
 
 /* spells2.c */
-extern void message_pain(MONSTER_IDX m_idx, int dam);
+extern void message_pain(MONSTER_IDX m_idx, HIT_POINT dam);
 extern void self_knowledge(void);
 extern bool detect_traps(POSITION range, bool known);
 extern bool detect_doors(POSITION range);
@@ -1130,12 +1130,12 @@ extern bool mass_genocide(int power, bool player_cast);
 extern bool mass_genocide_undead(int power, bool player_cast);
 extern bool probing(void);
 extern bool banish_evil(int dist);
-extern bool dispel_evil(int dam);
-extern bool dispel_good(int dam);
-extern bool dispel_undead(int dam);
-extern bool dispel_monsters(int dam);
-extern bool dispel_living(int dam);
-extern bool dispel_demons(int dam);
+extern bool dispel_evil(HIT_POINT dam);
+extern bool dispel_good(HIT_POINT dam);
+extern bool dispel_undead(HIT_POINT dam);
+extern bool dispel_monsters(HIT_POINT dam);
+extern bool dispel_living(HIT_POINT dam);
+extern bool dispel_demons(HIT_POINT dam);
 extern bool crusade(void);
 extern bool turn_undead(void);
 extern bool destroy_area(int y1, int x1, int r, bool in_generate);
@@ -1143,25 +1143,25 @@ extern bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx);
 extern bool earthquake(int cy, int cx, int r);
 extern void lite_room(int y1, int x1);
 extern void unlite_room(int y1, int x1);
-extern bool lite_area(int dam, int rad);
-extern bool unlite_area(int dam, int rad);
-extern bool fire_ball(int typ, int dir, int dam, int rad);
-extern bool fire_rocket(int typ, int dir, int dam, int rad);
-extern bool fire_ball_hide(int typ, int dir, int dam, int rad);
-extern bool fire_meteor(int who, int typ, int x, int y, int dam, int rad);
-extern bool fire_bolt(int typ, int dir, int dam);
+extern bool lite_area(HIT_POINT dam, int rad);
+extern bool unlite_area(HIT_POINT dam, int rad);
+extern bool fire_ball(int typ, int dir, HIT_POINT dam, int rad);
+extern bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad);
+extern bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad);
+extern bool fire_meteor(int who, int typ, int x, int y, HIT_POINT dam, int rad);
+extern bool fire_bolt(int typ, int dir, HIT_POINT dam);
 extern bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev);
 extern void call_chaos(void);
-extern bool fire_beam(int typ, int dir, int dam);
-extern bool fire_bolt_or_beam(int prob, int typ, int dir, int dam);
-extern bool lite_line(int dir, int dam);
-extern bool drain_life(int dir, int dam);
+extern bool fire_beam(int typ, int dir, HIT_POINT dam);
+extern bool fire_bolt_or_beam(int prob, int typ, int dir, HIT_POINT dam);
+extern bool lite_line(int dir, HIT_POINT dam);
+extern bool drain_life(int dir, HIT_POINT dam);
 extern bool death_ray(int dir, int plev);
-extern bool wall_to_mud(int dir, int dam);
+extern bool wall_to_mud(int dir, HIT_POINT dam);
 extern bool destroy_door(int dir);
 extern bool disarm_trap(int dir);
 extern bool wizard_lock(int dir);
-extern bool heal_monster(int dir, int dam);
+extern bool heal_monster(int dir, HIT_POINT dam);
 extern bool speed_monster(int dir, int power);
 extern bool slow_monster(int dir, int power);
 extern bool sleep_monster(int dir, int power);
@@ -1179,33 +1179,33 @@ extern bool tree_creation(void);
 extern bool glyph_creation(void);
 extern bool destroy_doors_touch(void);
 extern bool disarm_traps_touch(void);
-extern bool animate_dead(int who, int y, int x);
+extern bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x);
 extern bool sleep_monsters_touch(void);
 extern bool activate_ty_curse(bool stop_ty, int *count);
 extern int activate_hi_summon(POSITION y, POSITION x, bool can_pet);
 extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x);
 extern void wall_breaker(void);
-extern bool confuse_monsters(int dam);
-extern bool charm_monsters(int dam);
-extern bool charm_animals(int dam);
-extern bool stun_monsters(int dam);
-extern bool stasis_monsters(int dam);
+extern bool confuse_monsters(HIT_POINT dam);
+extern bool charm_monsters(HIT_POINT dam);
+extern bool charm_animals(HIT_POINT dam);
+extern bool stun_monsters(HIT_POINT dam);
+extern bool stasis_monsters(HIT_POINT dam);
 extern bool banish_monsters(int dist);
-extern bool turn_monsters(int dam);
-extern bool turn_evil(int dam);
+extern bool turn_monsters(HIT_POINT dam);
+extern bool turn_evil(HIT_POINT dam);
 extern bool deathray_monsters(void);
 extern bool charm_monster(int dir, int plev);
 extern bool control_one_undead(int dir, int plev);
 extern bool control_one_demon(int dir, int plev);
 extern bool charm_animal(int dir, int plev);
 extern bool charm_living(int dir, int plev);
-extern bool mindblast_monsters(int dam);
+extern bool mindblast_monsters(HIT_POINT dam);
 extern s32b flag_cost(object_type *o_ptr, int plusses);
 extern void report_magics(void);
 extern bool teleport_swap(int dir);
 extern bool item_tester_hook_recharge(object_type *o_ptr);
-extern bool project_hook(int typ, int dir, int dam, int flg);
-extern bool project_hack(int typ, int dam);
+extern bool project_hook(int typ, int dir, HIT_POINT dam, int flg);
+extern bool project_hack(int typ, HIT_POINT dam);
 extern bool eat_magic(int power);
 extern void discharge_minion(void);
 extern bool kawarimi(bool success);
@@ -1251,7 +1251,7 @@ extern bool identify_fully(bool only_equip);
 extern bool recharge(int num);
 extern bool bless_weapon(void);
 extern bool pulish_shield(void);
-extern bool potion_smash_effect(int who, POSITION y, POSITION x, int k_idx);
+extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx);
 extern void display_spell_list(void);
 extern s16b experience_of_spell(int spell, int realm);
 extern int mod_need_mana(int need_mana, int spell, int realm);
@@ -1269,10 +1269,10 @@ 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(int dam, cptr kb_str, int monspell, bool aura);
-extern int elec_dam(int dam, cptr kb_str, int monspell, bool aura);
-extern int fire_dam(int dam, cptr kb_str, int monspell, bool aura);
-extern int cold_dam(int dam, cptr kb_str, int monspell, bool aura);
+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);
@@ -1302,8 +1302,8 @@ extern IDX quest_number(DEPTH level);
 extern IDX random_quest_number(DEPTH level);
 extern bool tele_town(void);
 extern HIT_POINT calc_crit_ratio_shot(HIT_POINT plus_ammo, HIT_POINT plus_bow);
-extern HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, int dam);
-extern HIT_POINT calc_expect_crit(int weight, int plus, int dam, s16b meichuu, bool dokubari);
+extern HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, HIT_POINT dam);
+extern HIT_POINT calc_expect_crit(int weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari);
 
 /* util.c */
 extern errr path_parse(char *buf, int max, cptr file);
@@ -1489,7 +1489,7 @@ 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 void monster_death(MONSTER_IDX m_idx, bool drop_item);
-extern bool mon_take_hit(MONSTER_IDX m_idx, int dam, bool *fear, cptr note);
+extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note);
 extern void get_screen_size(int *wid_p, int *hgt_p);
 extern void panel_bounds_center(void);
 extern void resize_map(void);
@@ -1729,7 +1729,7 @@ extern bool change_wild_mode(void);
 extern void spoil_random_artifact(cptr fname);
 
 /* wizard2.c */
-extern void strip_name(char *buf, int k_idx);
+extern void strip_name(char *buf, KIND_OBJECT_IDX k_idx);
 
 /* avatar.c */
 extern bool compare_virtue(int type, int num, int tekitou);
@@ -1805,7 +1805,7 @@ extern bool stop_hex_spell(void);
 extern void check_hex(void);
 extern bool hex_spell_fully(void);
 extern void revenge_spell(void);
-extern void revenge_store(int dam);
+extern void revenge_store(HIT_POINT dam);
 extern bool teleport_barrier(MONSTER_IDX m_idx);
 extern bool magic_barrier(MONSTER_IDX m_idx);
 extern bool multiply_barrier(MONSTER_IDX m_idx);