/* cmd1.c */
extern bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name);
extern bool test_hit_norm(int chance, int ac, int vis);
-extern s16b critical_shot(int weight, int plus_ammo, int plus_bow, int dam);
-extern s16b critical_norm(int weight, int plus, int dam, s16b meichuu, int mode);
+extern hit_point critical_shot(int weight, int plus_ammo, int plus_bow, hit_point dam);
+extern hit_point critical_norm(int weight, int plus, hit_point dam, s16b meichuu, int mode);
extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bool thrown);
extern void search(void);
extern void py_pickup_aux(int o_idx);
extern bool py_attack(int y, int x, int mode);
extern bool pattern_seq(int c_y, int c_x, int n_y, int n_x);
extern bool player_can_enter(s16b feature, u16b mode);
-extern bool move_player_effect(int ny, int nx, u32b mpe_mode);
+extern bool move_player_effect(position ny, position nx, u32b mpe_mode);
extern bool trap_can_be_ignored(int feat);
-extern void move_player(int dir, bool do_pickup, bool break_trap);
+extern void move_player(direction dir, bool do_pickup, bool break_trap);
extern void run_step(int dir);
#ifdef TRAVEL
extern void travel_step(void);
/* melee1.c */
/* melee2.c */
-extern bool make_attack_normal(int m_idx);
+extern bool make_attack_normal(idx m_idx);
extern void process_monsters(void);
extern int get_mproc_idx(int m_idx, int mproc_type);
extern void mproc_init(void);
extern bool make_object(object_type *j_ptr, u32b mode);
extern void place_object(int y, int x, u32b mode);
extern bool make_gold(object_type *j_ptr);
-extern void place_gold(int y, int x);
+extern void place_gold(position y, position x);
extern s16b drop_near(object_type *o_ptr, int chance, int y, int x);
extern void acquirement(int y1, int x1, int num, bool great, bool special, bool known);
extern void amusement(int y1, int x1, int num, bool known);
extern bool place_mirror(void);
extern bool explosive_rune(void);
extern void identify_pack(void);
-extern bool remove_curse(void);
-extern bool remove_all_curse(void);
+extern int remove_curse(void);
+extern int remove_all_curse(void);
extern bool alchemy(void);
extern bool enchant(object_type *o_ptr, int n, int eflag);
extern bool enchant_spell(int num_hit, int num_dam, int num_ac);
extern void set_action(int typ);
extern void reset_tim_flags(void);
extern void dispel_player(void);
-extern bool set_mimic(int v, int p, bool do_dec);
-extern bool set_blind(int v);
-extern bool set_confused(int v);
-extern bool set_poisoned(int v);
-extern bool set_afraid(int v);
-extern bool set_paralyzed(int v);
-extern bool set_image(int v);
-extern bool set_fast(int v, bool do_dec);
-extern bool set_slow(int v, bool do_dec);
-extern bool set_shield(int v, bool do_dec);
-extern bool set_tsubureru(int v, bool do_dec);
-extern bool set_magicdef(int v, bool do_dec);
-extern bool set_blessed(int v, bool do_dec);
-extern bool set_hero(int v, bool do_dec);
-extern bool set_shero(int v, bool do_dec);
-extern bool set_protevil(int v, bool do_dec);
-extern bool set_invuln(int v, bool do_dec);
-extern bool set_tim_invis(int v, bool do_dec);
-extern bool set_tim_infra(int v, bool do_dec);
-extern bool set_tim_regen(int v, bool do_dec);
-extern bool set_tim_stealth(int v, bool do_dec);
-extern bool set_lightspeed(int v, bool do_dec);
-extern bool set_tim_levitation(int v, bool do_dec);
-extern bool set_tim_sh_touki(int v, bool do_dec);
-extern bool set_tim_sh_fire(int v, bool do_dec);
-extern bool set_tim_sh_holy(int v, bool do_dec);
-extern bool set_tim_eyeeye(int v, bool do_dec);
-extern bool set_resist_magic(int v, bool do_dec);
-extern bool set_tim_reflect(int v, bool do_dec);
-extern bool set_multishadow(int v, bool do_dec);
-extern bool set_dustrobe(int v, bool do_dec);
-extern bool set_kabenuke(int v, bool do_dec);
-extern bool set_tsuyoshi(int v, bool do_dec);
-extern bool set_ele_attack(u32b attack_type, int v);
-extern bool set_ele_immune(u32b immune_type, int v);
-extern bool set_oppose_acid(int v, bool do_dec);
-extern bool set_oppose_elec(int v, bool do_dec);
-extern bool set_oppose_fire(int v, bool do_dec);
-extern bool set_oppose_cold(int v, bool do_dec);
-extern bool set_oppose_pois(int v, bool do_dec);
-extern bool set_stun(int v);
-extern bool set_cut(int v);
-extern bool set_food(int v);
+extern bool set_mimic(time_effect v, int p, bool do_dec);
+extern bool set_blind(time_effect v);
+extern bool set_confused(time_effect v);
+extern bool set_poisoned(time_effect v);
+extern bool set_afraid(time_effect v);
+extern bool set_paralyzed(time_effect v);
+extern bool set_image(time_effect v);
+extern bool set_fast(time_effect v, bool do_dec);
+extern bool set_slow(time_effect v, bool do_dec);
+extern bool set_shield(time_effect v, bool do_dec);
+extern bool set_tsubureru(time_effect v, bool do_dec);
+extern bool set_magicdef(time_effect v, bool do_dec);
+extern bool set_blessed(time_effect v, bool do_dec);
+extern bool set_hero(time_effect v, bool do_dec);
+extern bool set_shero(time_effect v, bool do_dec);
+extern bool set_protevil(time_effect v, bool do_dec);
+extern bool set_invuln(time_effect v, bool do_dec);
+extern bool set_tim_invis(time_effect v, bool do_dec);
+extern bool set_tim_infra(time_effect v, bool do_dec);
+extern bool set_tim_regen(time_effect v, bool do_dec);
+extern bool set_tim_stealth(time_effect v, bool do_dec);
+extern bool set_lightspeed(time_effect v, bool do_dec);
+extern bool set_tim_levitation(time_effect v, bool do_dec);
+extern bool set_tim_sh_touki(time_effect v, bool do_dec);
+extern bool set_tim_sh_fire(time_effect v, bool do_dec);
+extern bool set_tim_sh_holy(time_effect v, bool do_dec);
+extern bool set_tim_eyeeye(time_effect v, bool do_dec);
+extern bool set_resist_magic(time_effect v, bool do_dec);
+extern bool set_tim_reflect(time_effect v, bool do_dec);
+extern bool set_multishadow(time_effect v, bool do_dec);
+extern bool set_dustrobe(time_effect v, bool do_dec);
+extern bool set_kabenuke(time_effect v, bool do_dec);
+extern bool set_tsuyoshi(time_effect v, bool do_dec);
+extern bool set_ele_attack(u32b attack_type, time_effect v);
+extern bool set_ele_immune(u32b immune_type, time_effect v);
+extern bool set_oppose_acid(time_effect v, bool do_dec);
+extern bool set_oppose_elec(time_effect v, bool do_dec);
+extern bool set_oppose_fire(time_effect v, bool do_dec);
+extern bool set_oppose_cold(time_effect v, bool do_dec);
+extern bool set_oppose_pois(time_effect v, bool do_dec);
+extern bool set_stun(time_effect v);
+extern bool set_cut(time_effect v);
+extern bool set_food(time_effect v);
extern bool inc_stat(int stat);
extern bool dec_stat(int stat, int amount, int permanent);
extern bool res_stat(int stat);
extern void lose_exp(s32b amount);
extern bool drain_exp(s32b drain, s32b slip, int hold_exp_prob);
extern void do_poly_self(void);
-extern bool set_ultimate_res(int v, bool do_dec);
-extern bool set_tim_res_nether(int v, bool do_dec);
-extern bool set_tim_res_time(int v, bool do_dec);
+extern bool set_ultimate_res(time_effect v, bool do_dec);
+extern bool set_tim_res_nether(time_effect v, bool do_dec);
+extern bool set_tim_res_time(time_effect v, bool do_dec);
extern bool choose_ele_attack(void);
-extern bool choose_ele_immune(int turn);
-extern bool set_wraith_form(int v, bool do_dec);
-extern bool set_tim_esp(int v, bool do_dec);
+extern bool choose_ele_immune(time_effect turn);
+extern bool set_wraith_form(time_effect v, bool do_dec);
+extern bool set_tim_esp(time_effect v, bool do_dec);
extern bool set_superstealth(bool set);
/* xtra2.c */
extern bool tgt_pt (int *x, int *y);
extern void do_poly_wounds(void);
extern void change_race(int new_race, cptr effect_msg);
-extern int mon_damage_mod(monster_type *m_ptr, int dam, bool is_psy_spear);
+extern hit_point mon_damage_mod(monster_type *m_ptr, hit_point dam, bool is_psy_spear);
extern s16b gain_energy(void);
extern s16b bow_energy(int sval);
extern int bow_tmul(int sval);