X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=1cc277c0ec35d1bfd58543fec7bd722df8ec086b;hb=8c1a95510c03a7dab763274007b5f665f109d66a;hp=486ea099148c7a412e670eeb4e106bb122da58c9;hpb=b3e86b3c5d2eb2a2f86120e05d2ed7c61c22c945;p=hengband%2Fhengband.git

diff --git a/src/externs.h b/src/externs.h
index 486ea0991..1cc277c0e 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -381,6 +381,8 @@ extern bool cheat_xtra;
 extern bool cheat_know;
 extern bool cheat_live;
 extern bool cheat_save;
+extern bool cheat_diary_output;
+extern bool cheat_turn;
 
 extern char record_o_name[MAX_NLEN];
 extern s32b record_turn;
@@ -425,11 +427,11 @@ extern bool *macro__cmd;
 extern char *macro__buf;
 extern s16b quark__num;
 extern cptr *quark__str;
-extern u16b message__next;
-extern u16b message__last;
-extern u16b message__head;
-extern u16b message__tail;
-extern u16b *message__ptr;
+extern u32b message__next;
+extern u32b message__last;
+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];
@@ -696,8 +698,8 @@ extern void glow_deep_lava_and_bldg(void);
 /* 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);
@@ -705,9 +707,9 @@ extern void carry(bool pickup);
 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);
@@ -918,7 +920,7 @@ extern bool load_floor(saved_floor_type *sf_ptr, u32b mode);
 
 /* 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);
@@ -1045,7 +1047,7 @@ extern void apply_magic(object_type *o_ptr, int lev, u32b mode);
 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);
@@ -1236,8 +1238,8 @@ extern bool warding_glyph(void);
 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);
@@ -1336,12 +1338,14 @@ extern char inkey(void);
 extern cptr quark_str(s16b num);
 extern void quark_init(void);
 extern s16b quark_add(cptr str);
-extern s16b message_num(void);
+extern s32b message_num(void);
 extern cptr message_str(int age);
 extern void message_add(cptr msg);
 extern void msg_print(cptr msg);
+extern void msg_print_wizard(int cheat_type, cptr msg);
 #ifndef SWIG
 extern void msg_format(cptr fmt, ...);
+extern void msg_format_wizard(int cheat_type, cptr fmt, ...);
 #endif /* SWIG */
 extern void screen_save(void);
 extern void screen_load(void);
@@ -1411,49 +1415,49 @@ extern void update_playtime(void);
 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);
@@ -1469,13 +1473,13 @@ extern void calc_android_exp(void);
 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 */
@@ -1498,7 +1502,7 @@ extern void ang_sort(vptr u, vptr v, int n);
 extern bool target_able(int m_idx);
 extern bool target_okay(void);
 extern bool target_set(int mode);
-extern void target_set_prepare_look();
+extern void target_set_prepare_look(void);
 extern bool get_aim_dir(int *dp);
 extern bool get_hack_dir(int *dp);
 extern bool get_rep_dir(int *dp, bool under);
@@ -1507,7 +1511,7 @@ extern void gain_level_reward(int chosen_reward);
 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);
@@ -1811,7 +1815,7 @@ extern bool stop_hex_spell_all(void);
 extern bool stop_hex_spell(void);
 extern void check_hex(void);
 extern bool hex_spell_fully(void);
-extern void revenge_spell();
+extern void revenge_spell(void);
 extern void revenge_store(int dam);
 extern bool teleport_barrier(int m_idx);
 extern bool magic_barrier(int m_idx);